Refactor content client to include a single Request/CancelPermission method.

chrome/browser/chrome_content_browser_client.h

Index: chrome/browser/chrome_content_browser_client.h
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index fcda73372f6099dc653ecc816cad842518cfde40..e4a6f34544c5663f6694d79241077e8c87b61f43 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -197,31 +197,24 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
       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,
-      const base::Callback<void(bool)>& result_callback) OVERRIDE;
-  virtual void CancelGeolocationPermissionRequest(
+  virtual void RequestPermission(
+       content::PermissionType permission,
+       content::WebContents* web_contents,
+       int bridge_id,
+       const GURL& requesting_frame,
+       bool user_gesture,
+       const base::Callback<void(bool)>& result_callback) OVERRIDE;
+
+  virtual void CancelPermissionRequest(
+      content::PermissionType permission,
       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;
-  virtual void RequestProtectedMediaIdentifierPermission(
-      content::WebContents* web_contents,
-      const GURL& origin,
-      base::Callback<void(bool)> result_callback,
-      base::Closure* cancel_callback) OVERRIDE;
+
   virtual bool CanCreateWindow(const GURL& opener_url,
                                const GURL& opener_top_level_frame_url,
                                const GURL& source_origin,