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..bdcfcdacb1ef2c8797b6ae14285311ab4562a1fb 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) {
+    const 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,
+                            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(