Migrate geolocation permissions to the new common permission class.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 02defb8524a63c1588d18e1913c32e3d89362861..21d3ddab807beb72afe016e0fb17ebb0558ce262 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1940,13 +1940,35 @@ void ChromeContentBrowserClient::RequestGeolocationPermission(
     int bridge_id,
     const GURL& requesting_frame,
     bool user_gesture,
-    base::Callback<void(bool)> result_callback,
-    base::Closure* cancel_callback) {
+    base::Callback<void(bool)> result_callback) {
+  int render_process_id = web_contents->GetRenderProcessHost()->GetID();
+  int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
+
+  const PermissionRequestID request_id(render_process_id,
+                                       render_view_id,
+                                       bridge_id,
+                                       requesting_frame);
   GeolocationPermissionContextFactory::GetForProfile(
       Profile::FromBrowserContext(web_contents->GetBrowserContext()))->
-          RequestGeolocationPermission(web_contents, bridge_id,
-                                       requesting_frame, user_gesture,
-                                       result_callback, cancel_callback);
+          RequestPermission(web_contents, request_id,
+                            requesting_frame.GetOrigin(), user_gesture,

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

Can we set a DCHECK_EQ instead:
DCHECK_EQ(requesting_frame, requesting_frame.GetOrigin())

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

Why? The content_browser_client API does not require you to pass an origin.
Other embedders might decide to handle permissions based on the url instead of
the orging. The chrome embedder does expect an origin which is why there is a
DCHECK already inside the PermissionContextBase#RequestPermission method.

+                            result_callback);
+}
+
+void ChromeContentBrowserClient::CancelGeolocationPermissionRequest(
+    content::WebContents* web_contents,
+    int bridge_id,
+    const GURL& requesting_frame) {
+  int render_process_id = web_contents->GetRenderProcessHost()->GetID();
+  int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
+
+  const PermissionRequestID request_id(render_process_id,
+                                       render_view_id,
+                                       bridge_id,
+                                       requesting_frame);
+  GeolocationPermissionContextFactory::GetForProfile(
+        Profile::FromBrowserContext(web_contents->GetBrowserContext()))->
+            CancelPermissionRequest(web_contents, request_id);
 }
 
 void ChromeContentBrowserClient::RequestMidiSysExPermission(