NOT FOR REVIEW: Aura on Android

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 59168c5e73df02e3dfcb8c063d087401642dd551..f96fd56ab1e34044dd82da1f06589a7d68d01c5f 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(OS_ANDROID) || defined(USE_AURA)
 #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 Singleton<GeolocationPermissionContextFactory>::get();
 }
 
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
 GeolocationPermissionContextFactory::GeolocationPermissionContextFactory()
     : BrowserContextKeyedServiceFactory(
           "GeolocationPermissionContext",
@@ -50,7 +50,7 @@ GeolocationPermissionContextFactory::~GeolocationPermissionContextFactory() {
 KeyedService*
 GeolocationPermissionContextFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) || defined(USE_AURA)
   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(OS_ANDROID) && !defined(USE_AURA)
   registry->RegisterBooleanPref(prefs::kGeolocationEnabled, true);
 #endif
 }