1 files changed, 12 insertions, 9 deletions

diff --git a/chrome/browser/media/protected_media_identifier_permission_context.h b/chrome/browser/media/protected_media_identifier_permission_context.h
index eaa5331..afedc08 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.h
+++ b/chrome/browser/media/protected_media_identifier_permission_context.h
@@ -29,12 +29,12 @@ class ProtectedMediaIdentifierPermissionContext
   void RequestProtectedMediaIdentifierPermission(
       int render_process_id,
       int render_view_id,
-      int bridge_id,
-      int group_id,
-      const GURL& requesting_frame,
+      const GURL& origin,
       const base::Callback<void(bool)>& callback);
   void CancelProtectedMediaIdentifierPermissionRequests(
-      int group_id);
+      int render_process_id,
+      int render_view_id,
+      const GURL& origin);
 
   // Called on the UI thread when the profile is about to be destroyed.
   void ShutdownOnUIThread();
@@ -54,7 +54,7 @@ class ProtectedMediaIdentifierPermissionContext
   // protected media identifier via
   // SetProtectedMediaIdentifierPermissionResponse(). Called on the UI thread.
   void NotifyPermissionSet(const PermissionRequestID& id,
-                           const GURL& requesting_frame,
+                           const GURL& origin,
                            const base::Callback<void(bool)>& callback,
                            bool allowed);
 
@@ -63,7 +63,7 @@ class ProtectedMediaIdentifierPermissionContext
   // or NotifyPermissionSet if permission decided by presenting an
   // infobar to the user. Called on the UI thread.
   void DecidePermission(const PermissionRequestID& id,
-                        const GURL& requesting_frame,
+                        const GURL& origin,
                         const GURL& embedder,
                         content::RenderViewHost* rvh,
                         const base::Callback<void(bool)>& callback);
@@ -73,7 +73,7 @@ class ProtectedMediaIdentifierPermissionContext
   // Should ultimately ensure that NotifyPermissionSet is called.
   // Called on the UI thread.
   void PermissionDecided(const PermissionRequestID& id,
-                         const GURL& requesting_frame,
+                         const GURL& origin,
                          const GURL& embedder,
                          const base::Callback<void(bool)>& callback,
                          bool allowed);
@@ -82,8 +82,11 @@ class ProtectedMediaIdentifierPermissionContext
   // provide additional UI flow.  Called on the UI thread.
   PermissionQueueController* CreateQueueController();
 
-  // Removes pending InfoBar requests that match |group_id|.
-  void CancelPendingInfobarRequests(int group_id);
+  // Removes pending InfoBar requests that match |bridge_id| from the tab
+  // given by |render_process_id| and |render_view_id|.
+  void CancelPendingInfobarRequests(int render_process_id,
+                                    int render_view_id,
+                                    const GURL& origin);
 
   // These must only be accessed from the UI thread.
   Profile* const profile_;