permissions: handle request ids for permissions in permission manager

android_webview/browser/aw_permission_manager.h

Index: android_webview/browser/aw_permission_manager.h
diff --git a/android_webview/browser/aw_permission_manager.h b/android_webview/browser/aw_permission_manager.h
index 842170b0bf55a396e80dfa47b15897b212d58fec..575aa7517bdebdfda724bf32a360b5865f2e5b3a 100644
--- a/android_webview/browser/aw_permission_manager.h
+++ b/android_webview/browser/aw_permission_manager.h
@@ -6,8 +6,10 @@
 #define ANDROID_WEBVIEW_BROWSER_AW_PERMISSION_MANAGER_H_
 
 #include "base/callback_forward.h"
+#include "base/id_map.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "content/public/browser/permission_manager.h"
 
 namespace android_webview {
@@ -20,17 +22,14 @@ class AwPermissionManager : public content::PermissionManager {
   ~AwPermissionManager() override;
 
   // PermissionManager implementation.
-  void RequestPermission(
+  int RequestPermission(
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
-      int request_id,
       const GURL& requesting_origin,
       bool user_gesture,
       const base::Callback<void(content::PermissionStatus)>& callback) override;
-  void CancelPermissionRequest(content::PermissionType permission,
-                               content::RenderFrameHost* render_frame_host,
-                               int request_id,
-                               const GURL& requesting_origin) override;
+  void CancelPermissionRequest(content::RenderFrameHost* render_frame_host,
+                               int request_id) override;
   void ResetPermission(content::PermissionType permission,
                        const GURL& requesting_origin,
                        const GURL& embedding_origin) override;
@@ -49,8 +48,27 @@ class AwPermissionManager : public content::PermissionManager {
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
  private:
+  struct PendingRequest;
+  using PendingRequestsMap = IDMap<PendingRequest, IDMapOwnPointer>;
+
+  static void OnRequestResponse(
+      const base::WeakPtr<AwPermissionManager>& manager,
+      int request_id,
+      const base::WeakPtr<LastRequestResultCache>& result_cache,
+      const base::Callback<void(content::PermissionStatus)>& callback,
+      content::PermissionType permission,
+      const GURL& requesting_origin,
+      const GURL& embedding_origin,
+      bool allowed);
+  int AddPendingRequestToMap(
+      content::PermissionType permission,
+      const GURL& requesting_origin);
+
+  PendingRequestsMap pending_requests_;
   scoped_ptr<LastRequestResultCache> result_cache_;
 
+  base::WeakPtrFactory<AwPermissionManager> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(AwPermissionManager);
 };