Dismiss EME infobar when WebMediaPlayer is destroyed.

chrome/browser/content_settings/permission_queue_controller.h

Index: chrome/browser/content_settings/permission_queue_controller.h
diff --git a/chrome/browser/content_settings/permission_queue_controller.h b/chrome/browser/content_settings/permission_queue_controller.h
index eabe256cbcfa90a35e1e263f58a532ca6fd9832f..c97bd3a870a8eefb37169ddecc41fac15f09a2cc 100644
--- a/chrome/browser/content_settings/permission_queue_controller.h
+++ b/chrome/browser/content_settings/permission_queue_controller.h
@@ -40,6 +40,9 @@ class PermissionQueueController : public content::NotificationObserver {
   // Cancels a specific infobar request.
   void CancelInfoBarRequest(const PermissionRequestID& id);
 
+  // Cancels all infobar requests that match |group_id|.
+  void CancelInfoBarRequests(int group_id);
+
   // Called by the InfoBarDelegate to notify permission has been set.
   // It'll notify and dismiss any other pending InfoBar request for the same
   // |requesting_frame| and embedder.
@@ -74,8 +77,8 @@ class PermissionQueueController : public content::NotificationObserver {
 
   void ClearPendingInfoBarRequestsForTab(const PermissionRequestID& id);
 
-  void RegisterForInfoBarNotifications(InfoBarService* infobar_service);
-  void UnregisterForInfoBarNotifications(InfoBarService* infobar_service);
+  void RegisterForInfoBarNotifications(InfoBarService* info_bar_service);
+  void UnregisterForInfoBarNotifications(InfoBarService* info_bar_service);
 
   void UpdateContentSetting(
       const GURL& requesting_frame, const GURL& embedder, bool allowed);
@@ -84,7 +87,7 @@ class PermissionQueueController : public content::NotificationObserver {
 
   Profile* const profile_;
   ContentSettingsType type_;
-  PendingInfoBarRequests pending_infobar_requests_;
+  PendingInfoBarRequests pending_info_bar_requests_;
   bool in_shutdown_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionQueueController);