Migrate geolocation permissions to the new common permission class.

chrome/browser/chrome_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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
 
 #include <set>
 #include <string>
 #include <utility>
@@ skipping 187 matching lines @@
   virtual void ShowDesktopNotification(
       const content::ShowDesktopNotificationHostMsgParams& params,
       content::RenderFrameHost* render_frame_host,
       scoped_ptr<content::DesktopNotificationDelegate> delegate,
       base::Closure* cancel_callback) OVERRIDE;
   virtual void 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) OVERRIDE;
+      base::Callback<void(bool)> result_callback) OVERRIDE;
+  virtual void CancelGeolocationPermissionRequest(
+      content::WebContents* web_contents,
+      int bridge_id,
+      const GURL& requesting_frame) OVERRIDE;
   virtual void 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) OVERRIDE;
   virtual void DidUseGeolocationPermission(content::WebContents* web_contents,
                                            const GURL& frame_url,
                                            const GURL& main_frame_url) OVERRIDE;
@@ skipping 133 matching lines @@
   std::vector<ChromeContentBrowserClientParts*> extra_parts_;
 
   base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
 };
 
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_