Android: Allow compiling browser without Java UI

chrome/browser/geolocation/geolocation_permission_context_factory.cc

Index: chrome/browser/geolocation/geolocation_permission_context_factory.cc
diff --git a/chrome/browser/geolocation/geolocation_permission_context_factory.cc b/chrome/browser/geolocation/geolocation_permission_context_factory.cc
index 27742b6b43d6ad76ccbc9c720c144d86cb76937a..3584ca24f63a4c72d5c10f7db8dbb43778a1b850 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_factory.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_factory.cc
@@ -9,7 +9,7 @@
 #include "chrome/common/pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/pref_registry/pref_registry_syncable.h"
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
 #include "chrome/browser/geolocation/geolocation_permission_context_android.h"
 #else
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
@@ -29,7 +29,7 @@ GeolocationPermissionContextFactory::GetInstance() {
   return base::Singleton<GeolocationPermissionContextFactory>::get();
 }
 
-#if !defined(OS_ANDROID)
+#if !defined(ANDROID_JAVA_UI)
 GeolocationPermissionContextFactory::GeolocationPermissionContextFactory()

[Ted C, 2015/11/30 19:39:05]

this most likely will need to be split out as I think you'll want at least some
parts of this

     : PermissionContextFactoryBase(
           "GeolocationPermissionContext",
@@ -50,7 +50,7 @@ GeolocationPermissionContextFactory::~GeolocationPermissionContextFactory() {
 KeyedService*
 GeolocationPermissionContextFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
-#if !defined(OS_ANDROID)
+#if !defined(ANDROID_JAVA_UI)
   return new GeolocationPermissionContext(static_cast<Profile*>(profile));
 #else
   return new GeolocationPermissionContextAndroid(
@@ -60,7 +60,7 @@ GeolocationPermissionContextFactory::BuildServiceInstanceFor(
 
 void GeolocationPermissionContextFactory::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-#if defined(OS_ANDROID)
+#if defined(ANDROID_JAVA_UI)
   registry->RegisterBooleanPref(prefs::kGeolocationEnabled, true);
 #endif
 }