permissions: handle request ids for permissions in permission manager

android_webview/browser/aw_permission_manager.h

 // Copyright 2015 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_AW_PERMISSION_MANAGER_H_
 #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 {
 
 class LastRequestResultCache;
 
 class AwPermissionManager : public content::PermissionManager {
  public:
   AwPermissionManager();
   ~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(int request_id) override;
   void ResetPermission(content::PermissionType permission,
                        const GURL& requesting_origin,
                        const GURL& embedding_origin) override;
   content::PermissionStatus GetPermissionStatus(
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin) override;
   void RegisterPermissionUsage(content::PermissionType permission,
                                const GURL& requesting_origin,
                                const GURL& embedding_origin) override;
   int SubscribePermissionStatusChange(
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
       const base::Callback<void(content::PermissionStatus)>& callback) override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
  private:
+  struct PendingRequest;
+  using PendingRequestsMap = IDMap<PendingRequest, IDMapOwnPointer>;
+
+  static void OnRequestResponse(
+      const base::WeakPtr<AwPermissionManager>& manager,

[mlamouri (slow - plz ping), 2015/09/16 14:42:56]

Don't make the method static, having a WeakPtr will do the right thing: the
callback will not be run if the WeakPtr is null.

[Lalit Maganti, 2015/09/16 16:41:10]

As discussed offline.

+      int request_id,
+      const base::Callback<void(content::PermissionStatus)>& callback,
+      content::PermissionType permission,
+      const GURL& requesting_origin,
+      const GURL& embedding_origin,
+      bool allowed);
+  int AddPendingRequestToMap(
+      int render_process_id,
+      int render_frame_id,
+      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);
 };
 
 } // namespace android_webview
 
 #endif // ANDROID_WEBVIEW_BROWSER_AW_PERMISSION_MANAGER_H_