Migrate geolocation permissions to the new common permission class.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 1922 matching lines @@
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 void ChromeContentBrowserClient::RequestGeolocationPermission(
     content::WebContents* web_contents,
     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(
     content::WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame,
     bool user_gesture,
     base::Callback<void(bool)> result_callback,
     base::Closure* cancel_callback) {
   MidiPermissionContext* context =
@@ skipping 680 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome