Dismiss EME infobar when WebMediaPlayer is destroyed.

chrome/browser/media/protected_media_identifier_permission_context.cc

 // Copyright 2013 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 "chrome/browser/media/protected_media_identifier_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
@@ skipping 25 matching lines @@
   // ProtectedMediaIdentifierPermissionContext may be destroyed on either
   // the UI thread or the IO thread, but the PermissionQueueController must have
   // been destroyed on the UI thread.
   DCHECK(!permission_queue_controller_.get());
 }
 
 void ProtectedMediaIdentifierPermissionContext::
     RequestProtectedMediaIdentifierPermission(
         int render_process_id,
         int render_view_id,
+        int bridge_id,
+        int group_id,
         const GURL& requesting_frame,
         const base::Callback<void(bool)>& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
 
   content::WebContents* web_contents =
       tab_util::GetWebContentsByID(render_process_id, render_view_id);
-  const PermissionRequestID id(render_process_id, render_view_id, 0);
+  const PermissionRequestID id(
+      render_process_id, render_view_id, bridge_id, group_id);
 
   if (extensions::GetViewType(web_contents) !=
       extensions::VIEW_TYPE_TAB_CONTENTS) {
     // The tab may have gone away, or the request may not be from a tab at all.
     LOG(WARNING)
         << "Attempt to use protected media identifier in tabless renderer: "
         << id.ToString()
         << " (can't prompt user without a visible tab)";
     NotifyPermissionSet(id, requesting_frame, callback, false);
     return;
   }
 
   GURL embedder = web_contents->GetLastCommittedURL();
   if (!requesting_frame.is_valid() || !embedder.is_valid()) {
     LOG(WARNING)
         << "Attempt to use protected media identifier from an invalid URL: "
         << requesting_frame << "," << embedder
         << " (proteced media identifier is not supported in popups)";
     NotifyPermissionSet(id, requesting_frame, callback, false);
     return;
   }
 
   content::RenderViewHost* rvh = web_contents->GetRenderViewHost();
   DecidePermission(id, requesting_frame, embedder, rvh, callback);
 }
 
 void ProtectedMediaIdentifierPermissionContext::
-    CancelProtectedMediaIdentifierPermissionRequest(
-        int render_process_id,
-        int render_view_id,
-        const GURL& requesting_frame) {
-  CancelPendingInfoBarRequest(
-      PermissionRequestID(render_process_id, render_view_id, 0));
+    CancelProtectedMediaIdentifierPermissionRequests(int group_id) {
+  CancelPendingInfobarRequests(group_id);
 }
 
 void ProtectedMediaIdentifierPermissionContext::DecidePermission(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
     content::RenderViewHost* rvh,
     const base::Callback<void(bool)>& callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
@@ skipping 81 matching lines @@
 }
 
 PermissionQueueController*
     ProtectedMediaIdentifierPermissionContext::CreateQueueController() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   return new PermissionQueueController(
       profile(), CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER);
 }
 
 void
-ProtectedMediaIdentifierPermissionContext::CancelPendingInfoBarRequest(
-    const PermissionRequestID& id) {
+ProtectedMediaIdentifierPermissionContext::CancelPendingInfobarRequests(
+    int group_id) {
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI,
         FROM_HERE,
         base::Bind(&ProtectedMediaIdentifierPermissionContext::
-                        CancelPendingInfoBarRequest,
+                        CancelPendingInfobarRequests,
                    this,
-                   id));
+                   group_id));
     return;
   }
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
-  QueueController()->CancelInfoBarRequest(id);
+  QueueController()->CancelInfoBarRequests(group_id);
 }