Migrate geolocation permissions to the new common permission class.

chrome/browser/geolocation/geolocation_permission_context_android.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_
 #define CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_
 
 // The flow for geolocation permissions on Android needs to take into account
 // the global geolocation settings so it differs from the desktop one. It
 // works as follows.
 // GeolocationPermissionContextAndroid::DecidePermission intercepts the flow in
 // the UI thread, and posts a task to the blocking pool to CheckSystemLocation.
 // CheckSystemLocation will in fact check several possible settings
 //     - The global system geolocation setting
 //     - The Google location settings on pre KK devices
 //     - An old internal Chrome setting on pre-JB MR1 devices
 // With all that information it will decide if system location is enabled.
 // If enabled, it proceeds with the per site flow via
 // GeolocationPermissionContext (which will check per site permissions, create
 // infobars, etc.).
 //
 // Otherwise the permission is already decided.
 
 // There is a bit of thread jumping since some of the permissions (like the
 // per site settings) are queried on the UI thread while the system level
 // permissions are considered I/O and thus checked in the blocking thread pool.
 
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/content_settings/permission_request_id.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 #include "url/gurl.h"
 
 namespace content {
 class WebContents;
 }
 
 class GoogleLocationSettingsHelper;
 
-
 class GeolocationPermissionContextAndroid
     : public GeolocationPermissionContext {
  public:
   explicit GeolocationPermissionContextAndroid(Profile* profile);
+  virtual ~GeolocationPermissionContextAndroid();
 
  private:
   struct PermissionRequestInfo {

[Michael van Ouwerkerk, 2014/08/13 10:01:10]

This struct looks generic. Can it be used for other APIs as well? Or should we
just get rid of it?

[Miguel Garcia, 2014/08/13 13:18:13]

This is only used to pass information during the thread dance that android
geoloc requires. I think it's fine to have it here unless we end up needing the
same dance for other permissions (but right now there is no other global android
setting like geolocation).

     PermissionRequestInfo();
 
     PermissionRequestID id;
-    GURL requesting_frame;
+    GURL requesting_origin;
+    GURL embedder_origin;
     bool user_gesture;
-    GURL embedder;
   };
 
-  friend class GeolocationPermissionContext;
+  // PermissionContextBase:
+  virtual void RequestPermission(
+      content::WebContents* web_contents,
+       const PermissionRequestID& id,
+       const GURL& requesting_frame_origin,
+       bool user_gesture,
+       const BrowserPermissionCallback& callback) OVERRIDE;
 
-  virtual ~GeolocationPermissionContextAndroid();
-
-  // GeolocationPermissionContext implementation:
-  virtual void DecidePermission(content::WebContents* web_contents,
-                                const PermissionRequestID& id,
-                                const GURL& requesting_frame,
-                                bool user_gesture,
-                                const GURL& embedder,
-                                base::Callback<void(bool)> callback) OVERRIDE;
+  void CheckMasterLocation(content::WebContents* web_contents,
+                           const PermissionRequestInfo& info,
+                           const BrowserPermissionCallback& callback);
 
   void ProceedDecidePermission(content::WebContents* web_contents,
                                const PermissionRequestInfo& info,
                                base::Callback<void(bool)> callback);
 
+  // Will perform a final check on the system location settigns before

[Michael van Ouwerkerk, 2014/08/13 10:01:10]

s/settigns/settings/

[Miguel Garcia, 2014/08/13 13:18:13]

Done.

+  // granting the permission.
+  void InterceptPermissionCheck(const BrowserPermissionCallback& callback,
+                                bool granted);
+
   scoped_ptr<GoogleLocationSettingsHelper> google_location_settings_helper_;
+  base::WeakPtrFactory<GeolocationPermissionContextAndroid> weak_factory_;
 
- private:
-  void CheckSystemLocation(content::WebContents* web_contents,
-                           const PermissionRequestInfo& info,
-                           base::Callback<void(bool)> callback);
 
   DISALLOW_COPY_AND_ASSIGN(GeolocationPermissionContextAndroid);
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_GEOLOCATION_PERMISSION_CONTEXT_ANDROID_H_