Android: Allow compiling browser without Java UI

chrome/browser/media/permission_bubble_media_access_handler.cc

Index: chrome/browser/media/permission_bubble_media_access_handler.cc
diff --git a/chrome/browser/media/permission_bubble_media_access_handler.cc b/chrome/browser/media/permission_bubble_media_access_handler.cc
index 4c893924bdf2701f96f57f247dce1bafff9676be..199d956acf8ec8ac45e9aa6da6a5ec6610f37c6d 100644
--- a/chrome/browser/media/permission_bubble_media_access_handler.cc
+++ b/chrome/browser/media/permission_bubble_media_access_handler.cc
@@ -16,7 +16,7 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 #include <vector>
 
 #include "base/bind.h"
@@ -25,9 +25,9 @@
 #include "chrome/browser/permissions/permission_update_infobar_delegate_android.h"
 #else
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
-#endif  // OS_ANDROID
+#endif  // ANDROID_JAVA_UI
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 namespace {
 // Callback for the permission update infobar when the site and Chrome
 // permissions are mismatched on Android.
@@ -40,7 +40,7 @@ void OnPermissionConflictResolved(
 }
 }  // namespace
 
-#endif  // OS_ANDROID
+#endif  // ANDROID_JAVA_UI
 
 using content::BrowserThread;
 
@@ -141,7 +141,7 @@ void PermissionBubbleMediaAccessHandler::ProcessQueuedAccessRequest(
               &PermissionBubbleMediaAccessHandler::OnAccessRequestResponse,
               base::Unretained(this), web_contents)));
   if (!controller->IsAskingForAudio() && !controller->IsAskingForVideo()) {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
     // If either audio or video was previously allowed and Chrome no longer has
     // the necessary permissions, show a infobar to attempt to address this
     // mismatch.
@@ -165,7 +165,7 @@ void PermissionBubbleMediaAccessHandler::ProcessQueuedAccessRequest(
     return;
   }
 
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   MediaStreamInfoBarDelegateAndroid::Create(web_contents, controller.Pass());
 #else
   PermissionBubbleManager* bubble_manager =