Dismiss EME infobar when WebMediaPlayer is destroyed.

chrome/browser/geolocation/chrome_geolocation_permission_context.cc

 // Copyright (c) 2012 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/geolocation/chrome_geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
@@ skipping 44 matching lines @@
             requesting_frame_origin, callback));
     return;
   }
 
   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,
-                                          bridge_id);
+  const PermissionRequestID id(render_process_id, render_view_id, bridge_id, 0);
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
   if (extension_service) {
     const extensions::Extension* extension =
         extension_service->extensions()->GetExtensionOrAppByURL(
             requesting_frame_origin);
     if (IsExtensionWithPermissionOrSuggestInConsole(APIPermission::kGeolocation,
                                                     extension,
                                                     profile_)) {
       // Make sure the extension is in the calling process.
@@ skipping 28 matching lines @@
   }
 
   DecidePermission(id, requesting_frame_origin, embedder, callback);
 }
 
 void ChromeGeolocationPermissionContext::CancelGeolocationPermissionRequest(
     int render_process_id,
     int render_view_id,
     int bridge_id,
     const GURL& requesting_frame) {
-  CancelPendingInfoBarRequest(PermissionRequestID(
-      render_process_id, render_view_id, bridge_id));
+  CancelPendingInfobarRequest(PermissionRequestID(
+      render_process_id, render_view_id, bridge_id, 0));
 }
 
 void ChromeGeolocationPermissionContext::DecidePermission(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
     base::Callback<void(bool)> callback) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   ContentSetting content_setting =
@@ skipping 59 matching lines @@
   return permission_queue_controller_.get();
 }
 
 PermissionQueueController*
     ChromeGeolocationPermissionContext::CreateQueueController() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   return new PermissionQueueController(profile(),
                                        CONTENT_SETTINGS_TYPE_GEOLOCATION);
 }
 
-void ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest(
+void ChromeGeolocationPermissionContext::CancelPendingInfobarRequest(
     const PermissionRequestID& id) {
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(
-            &ChromeGeolocationPermissionContext::CancelPendingInfoBarRequest,
+            &ChromeGeolocationPermissionContext::CancelPendingInfobarRequest,
             this, id));
      return;
   }
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
   QueueController()->CancelInfoBarRequest(id);
 }