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

content/public/browser/content_browser_client.cc

Index: content/public/browser/content_browser_client.cc
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index bb2d7cff3cee50e5e92fc45f1c4e5b9cc0ec154e..50cb6345ba773a86531accdc4dd62fba886c86ac 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -212,7 +212,9 @@ ContentBrowserClient::CheckDesktopNotificationPermission(
   return blink::WebNotificationPermissionAllowed;
 }
 
-void ContentBrowserClient::RequestGeolocationPermission(
+
+void ContentBrowserClient::RequestPermission(
+    PermissionType permission,
     WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame,
@@ -221,32 +223,13 @@ void ContentBrowserClient::RequestGeolocationPermission(
   result_callback.Run(true);
 }
 
-// TODO(miguelg): Create a small interface to represent a permission request
-// instead of adding one method per permission and action.
-void ContentBrowserClient::CancelGeolocationPermissionRequest(
+void ContentBrowserClient::CancelPermissionRequest(
+    content::PermissionType permission,
     WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame) {
 }
 
-void ContentBrowserClient::RequestMidiSysExPermission(
-    WebContents* web_contents,
-    int bridge_id,
-    const GURL& requesting_frame,
-    bool user_gesture,
-    base::Callback<void(bool)> result_callback,
-    base::Closure* cancel_callback) {
-  result_callback.Run(true);
-}
-
-void ContentBrowserClient::RequestProtectedMediaIdentifierPermission(
-    WebContents* web_contents,
-    const GURL& origin,
-    base::Callback<void(bool)> result_callback,
-    base::Closure* cancel_callback) {
-  result_callback.Run(true);
-}
-
 bool ContentBrowserClient::CanCreateWindow(
     const GURL& opener_url,
     const GURL& opener_top_level_frame_url,