permissions: remove PermissionQueueController and introduce PermissionInfoBarManager

chrome/browser/permissions/permission_context_base_unittest.cc

 // Copyright 2014 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/permissions/permission_context_base.h"
 
 #include "base/bind.h"
 #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"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
@@ skipping 10 matching lines @@
  public:
   TestPermissionContext(Profile* profile,
                   const ContentSettingsType permission_type)
    : PermissionContextBase(profile, permission_type),
      permission_set_(false),
      permission_granted_(false),
      tab_context_updated_(false) {}
 
   ~TestPermissionContext() override {}
 
-#if defined(OS_ANDROID)
-  PermissionQueueController* GetInfoBarController() {
-    return GetQueueController();
-  }
-#endif
-
   bool permission_granted() {
     return permission_granted_;
   }
 
   bool permission_set() {
     return permission_set_;
   }
 
   bool tab_context_updated() {
     return tab_context_updated_;
@@ skipping 18 matching lines @@
  private:
    bool permission_set_;
    bool permission_granted_;
    bool tab_context_updated_;
 };
 
 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
   }
 
   void TestAskAndGrant_TestContent() {
     TestPermissionContext permission_context(
         profile(), CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
     GURL url("http://www.google.com");
     content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
     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());
 
     ContentSetting setting =
         HostContentSettingsMapFactory::GetForProfile(profile())
             ->GetContentSetting(url.GetOrigin(),
                                 url.GetOrigin(),
                                 CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
                                 std::string());
     EXPECT_EQ(CONTENT_SETTING_ALLOW, setting);
   }
 
   void TestAskAndDismiss_TestContent() {
     TestPermissionContext permission_context(
         profile(), CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
     GURL url("http://www.google.es");
     content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
     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());
 
     ContentSetting setting =
         HostContentSettingsMapFactory::GetForProfile(profile())
             ->GetContentSetting(url.GetOrigin(),
                                 url.GetOrigin(),
                                 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
                                 std::string());
     EXPECT_EQ(CONTENT_SETTING_ASK, setting);
   }
 
   void TestRequestPermissionInvalidUrl(ContentSettingsType type) {
     TestPermissionContext permission_context(profile(), type);
     GURL url;
     ASSERT_FALSE(url.is_valid());
     content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
     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());
     EXPECT_TRUE(permission_context.tab_context_updated());
 
     ContentSetting setting =
         HostContentSettingsMapFactory::GetForProfile(profile())
             ->GetContentSetting(url.GetOrigin(),
                                 url.GetOrigin(),
                                 type,
                                 std::string());
     EXPECT_EQ(CONTENT_SETTING_ASK, setting);
   }
 
   void TestGrantAndRevoke_TestContent(ContentSettingsType type,
                                       ContentSetting expected_default) {
     TestPermissionContext permission_context(profile(), type);
     GURL url("https://www.google.com");
     content::WebContentsTester::For(web_contents())->NavigateAndCommit(url);
 
     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());
 
     ContentSetting setting =
         HostContentSettingsMapFactory::GetForProfile(profile())
             ->GetContentSetting(url.GetOrigin(),
                                 url.GetOrigin(),
                                 type,
                                 std::string());
@@ skipping 12 matching lines @@
             ->GetDefaultContentSetting(type, nullptr);
     EXPECT_EQ(default_setting, setting_after_reset);
   }
 
  private:
   // ChromeRenderViewHostTestHarness:
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 #if defined(OS_ANDROID)
     InfoBarService::CreateForWebContents(web_contents());
+    PermissionInfoBarManager::CreateForWebContents(web_contents());
 #else
     PermissionBubbleManager::CreateForWebContents(web_contents());
 #endif
   }
 
   DISALLOW_COPY_AND_ASSIGN(PermissionContextBaseTests);
 };
 
 // Simulates clicking Accept. The permission should be granted and
 // saved for future use.
@@ skipping 47 matching lines @@
 #if defined(ENABLE_NOTIFICATIONS)
   TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
                                  CONTENT_SETTING_ASK);
 #endif
   TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
                                  CONTENT_SETTING_ASK);
   TestGrantAndRevoke_TestContent(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
                                  CONTENT_SETTING_ASK);
 }
 #endif