permissions: remove PermissionQueueController and introduce PermissionInfoBarManager

chrome/browser/permissions/permission_manager.cc

Index: chrome/browser/permissions/permission_manager.cc
diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc
index 1f18104f03f3b1f6895c52da134ccf382aac173c..fcc4451b55991bc488ac3a4f74791816fed07380 100644
--- a/chrome/browser/permissions/permission_manager.cc
+++ b/chrome/browser/permissions/permission_manager.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/permissions/permission_context.h"
 #include "chrome/browser/permissions/permission_context_base.h"
+#include "chrome/browser/permissions/permission_infobar_manager.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
@@ -166,7 +167,7 @@ int PermissionManager::RequestPermission(
 
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
-  if (IsPermissionBubbleManagerMissing(web_contents)) {
+  if (IsPermissionUIManagerMissing(web_contents)) {
     callback.Run(
         GetPermissionStatus(permission, requesting_origin,
                             web_contents->GetLastCommittedURL().GetOrigin()));
@@ -212,7 +213,7 @@ void PermissionManager::CancelPermissionRequest(
 
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host);
-  if (IsPermissionBubbleManagerMissing(web_contents))
+  if (IsPermissionUIManagerMissing(web_contents))
     return;
 
   int render_process_id = render_frame_host->GetProcess()->GetID();
@@ -300,13 +301,13 @@ void PermissionManager::UnsubscribePermissionStatusChange(int subscription_id) {
         ->RemoveObserver(this);
 }
 
-bool PermissionManager::IsPermissionBubbleManagerMissing(
+bool PermissionManager::IsPermissionUIManagerMissing(
     content::WebContents* web_contents) {
-  // Can't be missing if it isn't needed to begin with.
-  if (!PermissionBubbleManager::Enabled())
-    return false;
+  if (PermissionBubbleManager::Enabled())
+    return PermissionBubbleManager::FromWebContents(web_contents) == nullptr;
 
-  return PermissionBubbleManager::FromWebContents(web_contents) == nullptr;
+  // Consider PermissionInfoBarManager's state instead
+  return PermissionInfoBarManager::FromWebContents(web_contents) == nullptr;
 }
 
 void PermissionManager::OnContentSettingChanged(