Replace ENABLE_JAVA_BRIDGE with OS_ANDROID.
This fixes a discrepancy between the definitions of WebContentsImpl in the Chrome and test binaries, since ENABLE_JAVA_BRIDGE wasn't defined in the test build files.
BUG=247807
TEST=WebContentsImplTest.* should pass after adding a field to WebContentsImpl.
Review URL: https://chromiumcodereview.appspot.com/16630004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205929 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 664bad6..ac97b98 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -98,7 +98,7 @@
#include "ui/surface/io_surface_support_mac.h"
#endif
-#if defined(ENABLE_JAVA_BRIDGE)
+#if defined(OS_ANDROID)
#include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
#endif
@@ -1239,7 +1239,7 @@
registrar_.Add(this,
NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
NotificationService::AllBrowserContextsAndSources());
-#if defined(ENABLE_JAVA_BRIDGE)
+#if defined(OS_ANDROID)
java_bridge_dispatcher_host_manager_.reset(
new JavaBridgeDispatcherHostManager(this));
#endif
