Android: Allow compiling browser without Java UI

chrome/browser/media/media_stream_devices_controller.cc

Index: chrome/browser/media/media_stream_devices_controller.cc
diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc
index 9dc47941853832eed7ab81e1a0ef3dc039dda302..3324cc37a450ef7e8015baa3a9efa4e1e180c4af 100644
--- a/chrome/browser/media/media_stream_devices_controller.cc
+++ b/chrome/browser/media/media_stream_devices_controller.cc
@@ -36,14 +36,14 @@
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 #include <vector>
 
 #include "chrome/browser/android/preferences/pref_service_bridge.h"
 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "ui/android/window_android.h"
-#endif  // OS_ANDROID
+#endif  // ANDROID_JAVA_UI
 
 using content::BrowserThread;
 
@@ -170,7 +170,7 @@ MediaStreamDevicesController::MediaStreamDevicesController(
     return;
   }
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   std::vector<ContentSettingsType> content_settings_types;
   if (IsAllowedForAudio())
     content_settings_types.push_back(CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC);
@@ -581,7 +581,7 @@ ContentSetting MediaStreamDevicesController::GetNewSetting(
 
 bool MediaStreamDevicesController::IsUserAcceptAllowed(
     ContentSettingsType content_type) const {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   content::ContentViewCore* cvc =
       content::ContentViewCore::FromWebContents(web_contents_);
   if (!cvc)