Introduce Android variants of ChromeGeolocationPermissionContext, GeolocationConfirmInfoBarDelegate

chrome/browser/geolocation/chrome_geolocation_permission_context.cc

Index: chrome/browser/geolocation/chrome_geolocation_permission_context.cc
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
index adc472133a8c8f257e88f33698a826789c9e0eee..ea6d79d4acd73c05eceafeb0110078fb55019291 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc
@@ -14,12 +14,10 @@
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/geolocation/geolocation_infobar_queue_controller.h"
-#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/view_type_utils.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ -32,19 +30,6 @@ using content::WebContents;
 
 // GeolocationPermissionContext -----------------------------------------------
 
-ChromeGeolocationPermissionContext* ChromeGeolocationPermissionContext::Create(
-    Profile* profile) {
-  return new ChromeGeolocationPermissionContext(profile);
-}
-
-void ChromeGeolocationPermissionContext::RegisterUserPrefs(
-    PrefService *user_prefs) {
-#if defined(OS_ANDROID)
-  user_prefs->RegisterBooleanPref(prefs::kGeolocationEnabled, true,
-                                  PrefService::UNSYNCABLE_PREF);
-#endif
-}
-
 ChromeGeolocationPermissionContext::ChromeGeolocationPermissionContext(
     Profile* profile)
     : profile_(profile) {
@@ -110,17 +95,6 @@ void ChromeGeolocationPermissionContext::DecidePermission(
     base::Callback<void(bool)> callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-#if defined(OS_ANDROID)
-  // Check to see if the feature in its entirety has been disabled.
-  // This must happen before other services (e.g. tabs, extensions)
-  // get an opportunity to allow the geolocation request.
-  if (!profile()->GetPrefs()->GetBoolean(prefs::kGeolocationEnabled)) {
-    PermissionDecided(render_process_id, render_view_id, bridge_id,
-                      requesting_frame, embedder, callback, false);
-    return;
-  }
-#endif
-
   ExtensionService* extension_service = profile_->GetExtensionService();
   if (extension_service) {
     const extensions::Extension* extension =