Migrate geolocation permissions to the new common permission class.

content/public/browser/content_browser_client.h

Index: content/public/browser/content_browser_client.h
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 455bff9ead1581821fc3b5f1c0f104f8c73a8332..65a5abbee97179d557c81c8985025720f92c8a07 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -444,8 +444,12 @@ class CONTENT_EXPORT ContentBrowserClient {
       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,