Migrate geolocation permissions to the new common permission class.

content/public/browser/content_browser_client.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 432 matching lines @@
 
   // The renderer is requesting permission to use Geolocation. When the answer
   // to a permission request has been determined, |result_callback| should be
   // called with the result. If |cancel_callback| is non-null, it's set to a
   // callback which can be used to cancel the permission request.
   virtual void RequestGeolocationPermission(
       WebContents* web_contents,
       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);
+
+  virtual void CancelGeolocationPermissionRequest(
+      WebContents* web_contents,
+      int bridge_id,
+      const GURL& requesting_frame);
 
   // Invoked when the Geolocation API uses its permission.
   virtual void DidUseGeolocationPermission(WebContents* web_contents,
                                            const GURL& frame_url,
                                            const GURL& main_frame_url) {}
 
   // Requests a permission to use system exclusive messages in MIDI events.
   // |result_callback| will be invoked when the request is resolved. If
   // |cancel_callback| is non-null, it's set to a callback which can be used to
   // cancel the permission request.
@@ skipping 188 matching lines @@
   // Allows an embedder to provide its own ExternalVideoSurfaceContainer
   // implementation.  Return NULL to disable external surface video.
   virtual ExternalVideoSurfaceContainer*
   OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_