permissions: remove PermissionQueueController and introduce PermissionInfoBarManager

chrome/browser/permissions/permission_context_base_unittest.cc

Index: chrome/browser/permissions/permission_context_base_unittest.cc
diff --git a/chrome/browser/permissions/permission_context_base_unittest.cc b/chrome/browser/permissions/permission_context_base_unittest.cc
index 031a90cdd1fcf5797c004a8f3b24f670f6ffd5bc..268a1f3e001542af72cd3fafa82dd329d9fa41ba 100644
--- a/chrome/browser/permissions/permission_context_base_unittest.cc
+++ b/chrome/browser/permissions/permission_context_base_unittest.cc
@@ -8,6 +8,8 @@
 #include "base/command_line.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/permissions/permission_infobar_manager.h"
+#include "chrome/browser/permissions/permission_infobar_request.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ -38,12 +40,6 @@ class TestPermissionContext : public PermissionContextBase {
 
   ~TestPermissionContext() override {}
 
-#if defined(OS_ANDROID)
-  PermissionQueueController* GetInfoBarController() {
-    return GetQueueController();
-  }
-#endif
-
   bool permission_granted() {
     return permission_granted_;
   }
@@ -82,21 +78,31 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
  protected:
   PermissionContextBaseTests() {}
 
+  void ShowUI() {
+#if defined(OS_ANDROID)
+    PermissionInfoBarManager* manager =
+      PermissionInfoBarManager::FromWebContents(web_contents());
+    manager->ShowNextQueuedRequest();
+#endif
+  }
+
   // Accept or dismiss the permission bubble or infobar.
-  void RespondToPermission(TestPermissionContext* context,
-                           const PermissionRequestID& id,
-                           const GURL& url,
-                           bool accept) {
+  void RespondToPermission(bool accept) {
 #if defined(OS_ANDROID)
-    context->GetInfoBarController()->OnPermissionSet(id, url, url, accept,
-                                                     accept);
-#else
     PermissionBubbleManager* manager =
         PermissionBubbleManager::FromWebContents(web_contents());
     if (accept)
       manager->Accept();
     else
       manager->Closing();
+#else
+    PermissionInfoBarManager* manager =
+      PermissionInfoBarManager::FromWebContents(web_contents());
+    if (accept)
+      manager->current_request_->AcceptForTests();
+    else
+      manager->current_request_->ClosingForTests();
+    }
 #endif
   }
 
@@ -109,14 +115,15 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
         web_contents()->GetMainFrame()->GetRoutingID(),
-        -1);
+        0);
     permission_context.RequestPermission(
         web_contents(),
         id, url, true,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
+    ShowUI();
 
-    RespondToPermission(&permission_context, id, url, true);
+    RespondToPermission(true);
     EXPECT_TRUE(permission_context.permission_set());
     EXPECT_TRUE(permission_context.permission_granted());
     EXPECT_TRUE(permission_context.tab_context_updated());
@@ -139,14 +146,15 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
         web_contents()->GetMainFrame()->GetRoutingID(),
-        -1);
+        0);
     permission_context.RequestPermission(
         web_contents(),
         id, url, true,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
+    ShowUI();
 
-    RespondToPermission(&permission_context, id, url, false);
+    RespondToPermission(false);
     EXPECT_TRUE(permission_context.permission_set());
     EXPECT_FALSE(permission_context.permission_granted());
     EXPECT_TRUE(permission_context.tab_context_updated());
@@ -169,12 +177,13 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
         web_contents()->GetMainFrame()->GetRoutingID(),
-        -1);
+        0);
     permission_context.RequestPermission(
         web_contents(),
         id, url, true,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
+    ShowUI();
 
     EXPECT_TRUE(permission_context.permission_set());
     EXPECT_FALSE(permission_context.permission_granted());
@@ -198,14 +207,15 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
     const PermissionRequestID id(
         web_contents()->GetRenderProcessHost()->GetID(),
         web_contents()->GetMainFrame()->GetRoutingID(),
-        -1);
+        0);
     permission_context.RequestPermission(
         web_contents(),
         id, url, true,
         base::Bind(&TestPermissionContext::TrackPermissionDecision,
                    base::Unretained(&permission_context)));
+    ShowUI();
 
-    RespondToPermission(&permission_context, id, url, true);
+    RespondToPermission(true);
     EXPECT_TRUE(permission_context.permission_set());
     EXPECT_TRUE(permission_context.permission_granted());
     EXPECT_TRUE(permission_context.tab_context_updated());
@@ -238,6 +248,7 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
     ChromeRenderViewHostTestHarness::SetUp();
 #if defined(OS_ANDROID)
     InfoBarService::CreateForWebContents(web_contents());
+    PermissionInfoBarManager::CreateForWebContents(web_contents());
 #else
     PermissionBubbleManager::CreateForWebContents(web_contents());
 #endif