Migrate geolocation permissions to the new common permission class.

android_webview/browser/aw_content_browser_client.h

Index: android_webview/browser/aw_content_browser_client.h
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
index 796c18073e7ee9922d5145f19d020aa235858ba0..a193d50dfde9006734f0944fdd56ed44b2da78e2 100644
--- a/android_webview/browser/aw_content_browser_client.h
+++ b/android_webview/browser/aw_content_browser_client.h
@@ -124,8 +124,11 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
       int bridge_id,
       const GURL& requesting_frame,
       bool user_gesture,
-      base::Callback<void(bool)> result_callback,
-      base::Closure* cancel_callback) OVERRIDE;
+      const 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,