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 6f67a4cd7991b93c97c0cad4249825a79965a677..d33dc31c2d7c06cbca27083a0b2b354a96f134e2 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,6 +30,7 @@ using content::WebContents;
 
 // GeolocationPermissionContext -----------------------------------------------
 
+#if !defined(OS_ANDROID)

[bulach, 2012/10/17 13:17:38]

if you agree with the comment in the other patch, this could be moved to real a
factory class, so that this file doesn't know anything about android..

[Ramya, 2012/10/17 21:43:31]

Done.

 ChromeGeolocationPermissionContext* ChromeGeolocationPermissionContext::Create(
     Profile *profile) {
   return new ChromeGeolocationPermissionContext(profile);
@@ -39,11 +38,8 @@ ChromeGeolocationPermissionContext* ChromeGeolocationPermissionContext::Create(
 
 void ChromeGeolocationPermissionContext::RegisterUserPrefs(
     PrefService *user_prefs) {
-#if defined(OS_ANDROID)
-  user_prefs->RegisterBooleanPref(prefs::kGeolocationEnabled, true,
-                                  PrefService::UNSYNCABLE_PREF);
-#endif
 }
+#endif
 
 ChromeGeolocationPermissionContext::ChromeGeolocationPermissionContext(
     Profile* profile)
@@ -110,17 +106,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 =