permissions: remove PermissionQueueController and introduce PermissionInfoBarManager

chrome/browser/geolocation/geolocation_permission_context_unittest.cc

 // Copyright (c) 2012 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/geolocation/geolocation_permission_context.h"
 
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
 #include "base/gtest_prod_util.h"
 #include "base/id_map.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/simple_test_clock.h"
 #include "base/time/clock.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/geolocation/geolocation_permission_context_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/permissions/permission_infobar_manager.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/ui/website_settings/mock_permission_bubble_view.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.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/infobars/core/confirm_infobar_delegate.h"
 #include "components/infobars/core/infobar.h"
@@ skipping 196 matching lines @@
       url, content::Referrer(), ui::PAGE_TRANSITION_TYPED, std::string());
   content::NavigationEntry* entry = new_tab->GetController().GetPendingEntry();
   content::RenderFrameHostTester::For(new_tab->GetMainFrame())
       ->SendNavigate(extra_tabs_.size() + 1, entry->GetUniqueID(), true, url);
 
   // Set up required helpers, and make this be as "tabby" as the code requires.
 #if defined(ENABLE_EXTENSIONS)
   extensions::SetViewType(new_tab, extensions::VIEW_TYPE_TAB_CONTENTS);
 #endif
   InfoBarService::CreateForWebContents(new_tab);
+  PermissionInfoBarManager::CreateForWebContents(new_tab);
   if (BubbleEnabled()) {
     PermissionBubbleManager::CreateForWebContents(new_tab);
     PermissionBubbleManager* permission_bubble_manager =
         PermissionBubbleManager::FromWebContents(new_tab);
     MockPermissionBubbleView::SetFactory(permission_bubble_manager, false);
     permission_bubble_manager->DisplayPendingRequests();
   }
 
   extra_tabs_.push_back(new_tab);
 }
@@ skipping 15 matching lines @@
 }
 
 void GeolocationPermissionContextTests::SetUp() {
   ChromeRenderViewHostTestHarness::SetUp();
 
   // Set up required helpers, and make this be as "tabby" as the code requires.
 #if defined(ENABLE_EXTENSIONS)
   extensions::SetViewType(web_contents(), extensions::VIEW_TYPE_TAB_CONTENTS);
 #endif
   InfoBarService::CreateForWebContents(web_contents());
+  PermissionInfoBarManager::CreateForWebContents(web_contents());
   TabSpecificContentSettings::CreateForWebContents(web_contents());
   geolocation_permission_context_ =
       GeolocationPermissionContextFactory::GetForProfile(profile());
 #if defined(OS_ANDROID)
   static_cast<GeolocationPermissionContextAndroid*>(
       geolocation_permission_context_)
       ->SetLocationSettingsForTesting(
           scoped_ptr<LocationSettings>(new MockLocationSettings()));
   MockLocationSettings::SetLocationStatus(true, true);
 #endif
@@ skipping 402 matching lines @@
   // Accept the permission in tab A0.
   if (BubbleEnabled()) {
     AcceptBubble(manager_a0);
   } else {
     infobars::InfoBar* infobar_a0 = infobar_service()->infobar_at(0);
     ConfirmInfoBarDelegate* infobar_delegate_a0 =
         infobar_a0->delegate()->AsConfirmInfoBarDelegate();
     ASSERT_TRUE(infobar_delegate_a0);
     infobar_delegate_a0->Accept();
     infobar_service()->RemoveInfoBar(infobar_a0);
-    EXPECT_EQ(2U, closed_infobar_tracker_.size());
+    EXPECT_EQ(1U, closed_infobar_tracker_.size());
     EXPECT_TRUE(closed_infobar_tracker_.Contains(infobar_a0));
   }
   CheckPermissionMessageSent(0, true);
-  // Because they're the same origin, this will cause tab A1's infobar to
-  // disappear. It does not cause the bubble to disappear: crbug.com/443013.
-  // TODO(felt): Update this test when the bubble's behavior is changed.
+  // Because they're the same origin, tab_a1's bubble/infobar should disappear.
+  // In the past, infobar used to disappear and bubble did not.
+  // Now both have a consistent behviour (albiet broken) of not removing
+  // the bubble/infobar: see crbug.com/443013.
+  // TODO(felt): Update this test when this behavior is changed.
   if (BubbleEnabled())
     ASSERT_EQ(1U, GetBubblesQueueSize(manager_a1));
   else
-    CheckPermissionMessageSentForTab(1, 0, true);
+    EXPECT_EQ(1U, infobar_service_for_tab(1)->infobar_count());
 
   // Either way, tab B should still have a pending permission request.
   if (BubbleEnabled())
     ASSERT_EQ(1U, GetBubblesQueueSize(manager_b));
   else
     ASSERT_EQ(1U, infobar_service_for_tab(0)->infobar_count());
 }
 
 TEST_F(GeolocationPermissionContextTests, QueuedOriginMultipleTabs) {
   GURL url_a("http://www.example.com/geolocation");
@@ skipping 28 matching lines @@
   // Accept the first request in tab A1.
   if (BubbleEnabled()) {
     AcceptBubble(manager_a1);
   } else {
     infobars::InfoBar* infobar_a1 = infobar_service_for_tab(0)->infobar_at(0);
     ConfirmInfoBarDelegate* infobar_delegate_a1 =
         infobar_a1->delegate()->AsConfirmInfoBarDelegate();
     ASSERT_TRUE(infobar_delegate_a1);
     infobar_delegate_a1->Accept();
     infobar_service_for_tab(0)->RemoveInfoBar(infobar_a1);
-    EXPECT_EQ(2U, closed_infobar_tracker_.size());
+    EXPECT_EQ(1U, closed_infobar_tracker_.size());
     EXPECT_TRUE(closed_infobar_tracker_.Contains(infobar_a1));
   }
   CheckPermissionMessageSentForTab(0, 0, true);
 
-  // Because they're the same origin, this will cause tab A0's infobar to
-  // disappear. It does not cause the bubble to disappear: crbug.com/443013.
-  // TODO(felt): Update this test when the bubble's behavior is changed.
-  if (BubbleEnabled()) {
+  // Because they're the same origin, tab_a0's bubble/infobar should disappear.
+  // In the past, infobar used to disappear and bubble did not.
+  // Now both have a consistent behviour (albiet broken) of not removing
+  // the bubble/infobar: see crbug.com/443013.
+  // TODO(felt): Update this test when this behavior is changed.
+  if (BubbleEnabled())
     EXPECT_EQ(1U, GetBubblesQueueSize(manager_a0));
-  } else {
-    EXPECT_EQ(0U, infobar_service()->infobar_count());
-    CheckPermissionMessageSent(0, true);
-  }
+  else
+    EXPECT_EQ(1U, infobar_service()->infobar_count());
 
   // The second request should now be visible in tab A1.
   if (BubbleEnabled())
     ASSERT_EQ(1U, GetBubblesQueueSize(manager_a1));
   else
     ASSERT_EQ(1U, infobar_service_for_tab(0)->infobar_count());
 
   // Accept the second request and check that it's gone.
   if (BubbleEnabled()) {
     AcceptBubble(manager_a1);
@@ skipping 173 matching lines @@
   // it is the embedder.
   EXPECT_EQ(map->GetLastUsage(requesting_frame_0.GetOrigin(),
                               requesting_frame_0.GetOrigin(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(),
             13);
   EXPECT_EQ(map->GetLastUsage(requesting_frame_1.GetOrigin(),
                               requesting_frame_0.GetOrigin(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION).ToDoubleT(),
             11);
 }