Group the different permission related methods in the content api.

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 e95688752426c043276adc3cb92721257875bb2d..2fd58598e38254e54bcfe480af84941821bb2b0f 100644
--- a/android_webview/browser/aw_content_browser_client.h
+++ b/android_webview/browser/aw_content_browser_client.h
@@ -118,28 +118,18 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
       content::RenderFrameHost* render_frame_host,
       scoped_ptr<content::DesktopNotificationDelegate> delegate,
       base::Closure* cancel_callback) override;
-  virtual void RequestGeolocationPermission(
+  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 CancelGeolocationPermissionRequest(
+  virtual void CancelPermissionRequest(

[Peter Beverloo, 2014/10/20 17:32:16]

Do you also plan to have a common function for checking whether permission has
been granted for a certain origin or origin+embedder pair?

[Miguel Garcia, 2014/10/21 17:17:11]

Not in this patch certainly. But if it's considered useful I can add it.
Otherwise we can wait and see how the infrastructure for the permission API
evolves for that. If we get the mojo service going there is not much sense to
keep updating the content API.

+      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 RequestProtectedMediaIdentifierPermission(
-    content::WebContents* web_contents,
-    const GURL& origin,
-    base::Callback<void(bool)> result_callback,
-    base::Closure* cancel_callback) override;
+      const GURL& origin) override;
   virtual bool CanCreateWindow(const GURL& opener_url,
                                const GURL& opener_top_level_frame_url,
                                const GURL& source_origin,