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 d83e12ebd2bafe951f595b83768df06470f7f362..1f0e5f66f79d7aca0bc8be905054d5e03f486353 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"
@@ -242,7 +243,7 @@ int PermissionManager::RequestPermissions(
     const PermissionType permission = permissions[i];
 
     if (IsConstantPermission(permission) ||
-        IsPermissionBubbleManagerMissing(web_contents) ||
+        IsPermissionUIManagerMissing(web_contents) ||
         !PermissionContext::Get(profile_, permission)) {
       OnPermissionsRequestResponseStatus(request_id, i,
           GetPermissionStatus(permission, requesting_origin, embedding_origin));
@@ -287,7 +288,7 @@ void PermissionManager::CancelPermissionRequest(int request_id) {
   content::WebContents* web_contents = tab_util::GetWebContentsByFrameID(
       pending_request->render_process_id(), pending_request->render_frame_id());
   DCHECK(web_contents);
-  if (IsPermissionBubbleManagerMissing(web_contents)) {
+  if (IsPermissionUIManagerMissing(web_contents)) {
     pending_requests_.Remove(request_id);
     return;
   }
@@ -380,7 +381,7 @@ void PermissionManager::UnsubscribePermissionStatusChange(int subscription_id) {
         ->RemoveObserver(this);
 }
 
-bool PermissionManager::IsPermissionBubbleManagerMissing(
+bool PermissionManager::IsPermissionUIManagerMissing(
     content::WebContents* web_contents) {
   // TODO(felt): Remove this method entirely. Leaving it to make a minimal
   // last-minute merge to 46. See crbug.com/457091 and crbug.com/534631.