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

content/public/browser/content_browser_client.cc

 // 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.
 
 #include "content/public/browser/content_browser_client.h"
 
 #include "base/files/file_path.h"
 #include "ui/gfx/image/image_skia.h"
 #include "url/gurl.h"
 
@@ skipping 194 matching lines @@
 }
 
 blink::WebNotificationPermission
 ContentBrowserClient::CheckDesktopNotificationPermission(
     const GURL& source_origin,
     ResourceContext* context,
     int render_process_id) {
   return blink::WebNotificationPermissionAllowed;
 }
 
-void ContentBrowserClient::RequestGeolocationPermission(
+
+void ContentBrowserClient::RequestPermission(
+    PermissionType permission,
     WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame,
     bool user_gesture,
     const base::Callback<void(bool)>& result_callback) {
   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,
     const GURL& source_origin,
     WindowContainerType container_type,
     const GURL& target_url,
     const Referrer& referrer,
     WindowOpenDisposition disposition,
     const blink::WebWindowFeatures& features,
     bool user_gesture,
@@ skipping 93 matching lines @@
 #endif
 
 bool ContentBrowserClient::CheckMediaAccessPermission(
     BrowserContext* browser_context,
     const GURL& security_origin,
     MediaStreamType type) {
   return false;
 }
 
 }  // namespace content