Show queued geolocation InfoBars when InfoBar is hidden.

chrome/browser/geolocation/chrome_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 <set>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/hash_tables.h"
@@ skipping 18 matching lines @@
 #include "content/test/test_renderer_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 using content::MockRenderProcessHost;
 using content::RenderViewHostTester;
 using content::WebContents;
 
 // ClosedDelegateTracker ------------------------------------------------------
 
-namespace {
-
 // We need to track which infobars were closed.
 class ClosedDelegateTracker : public content::NotificationObserver {
  public:
   ClosedDelegateTracker();
   virtual ~ClosedDelegateTracker();
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details);
 
   size_t size() const {
     return removed_infobar_delegates_.size();
   }
 
   bool Contains(InfoBarDelegate* delegate) const;
   void Clear();
 
  private:
+  FRIEND_TEST_ALL_PREFIXES(GeolocationPermissionContextTests, TabDestroyed);
   content::NotificationRegistrar registrar_;
   std::set<InfoBarDelegate*> removed_infobar_delegates_;
 };
 
 ClosedDelegateTracker::ClosedDelegateTracker() {
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
                  content::NotificationService::AllSources());
 }
 
 ClosedDelegateTracker::~ClosedDelegateTracker() {
 }
 
 void ClosedDelegateTracker::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED);
   removed_infobar_delegates_.insert(
       content::Details<InfoBarRemovedDetails>(details)->first);
 }
 
 bool ClosedDelegateTracker::Contains(InfoBarDelegate* delegate) const {
   return removed_infobar_delegates_.count(delegate) != 0;
 }
 
 void ClosedDelegateTracker::Clear() {
   removed_infobar_delegates_.clear();
 }
 
-}  // namespace
-
-
 // GeolocationPermissionContextTests ------------------------------------------
 
 // This class sets up GeolocationArbitrator.
 class GeolocationPermissionContextTests : public TabContentsWrapperTestHarness {
  public:
   GeolocationPermissionContextTests();
 
  protected:
   virtual ~GeolocationPermissionContextTests();
 
@@ skipping 30 matching lines @@
   void CheckTabContentsState(const GURL& requesting_frame,
                              ContentSetting expected_content_setting);
 
   scoped_refptr<ChromeGeolocationPermissionContext>
       geolocation_permission_context_;
   ClosedDelegateTracker closed_delegate_tracker_;
   ScopedVector<TabContentsWrapper> extra_tabs_;
 
  private:
   // TabContentsWrapperTestHarness:
-  virtual void SetUp();
-  virtual void TearDown();
+  virtual void SetUp() OVERRIDE;
+  virtual void TearDown() OVERRIDE;
 
   content::TestBrowserThread ui_thread_;
   content::MockGeolocation mock_geolocation_;
 
   // A map between renderer child id and a pair represending the bridge id and
   // whether the requested permission was allowed.
   base::hash_map<int, std::pair<int, bool> > responses_;
 };
 
 GeolocationPermissionContextTests::GeolocationPermissionContextTests()
@@ skipping 78 matching lines @@
 }
 
 void GeolocationPermissionContextTests::SetUp() {
   TabContentsWrapperTestHarness::SetUp();
   mock_geolocation_.Setup();
   geolocation_permission_context_ =
       new ChromeGeolocationPermissionContext(profile());
 }
 
 void GeolocationPermissionContextTests::TearDown() {
+  extra_tabs_.reset();
   mock_geolocation_.TearDown();
   TabContentsWrapperTestHarness::TearDown();
 }
 
 
 // Tests ----------------------------------------------------------------------
 
 TEST_F(GeolocationPermissionContextTests, SinglePermission) {
   GURL requesting_frame("http://www.example.com/geolocation");
   NavigateAndCommit(requesting_frame);
@@ skipping 212 matching lines @@
 
   // But the other tab should still have the info bar...
   ASSERT_EQ(1U, extra_tabs_[0]->infobar_tab_helper()->infobar_count());
   ConfirmInfoBarDelegate* infobar_1 = extra_tabs_[0]->infobar_tab_helper()->
       GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
   infobar_1->Cancel();
   extra_tabs_[0]->infobar_tab_helper()->RemoveInfoBar(infobar_1);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_1));
   infobar_1->InfoBarClosed();
-
-  extra_tabs_.reset();
 }
 
 TEST_F(GeolocationPermissionContextTests, QueuedOriginMultipleTabs) {
   GURL url_a("http://www.example.com/geolocation");
   GURL url_b("http://www.example-2.com/geolocation");
   NavigateAndCommit(url_a);
   AddNewTab(url_a);
 
   EXPECT_EQ(0U, infobar_tab_helper()->infobar_count());
   RequestGeolocationPermission(
@@ skipping 35 matching lines @@
   // Accept the second infobar.
   ConfirmInfoBarDelegate* infobar_1 = extra_tabs_[0]->infobar_tab_helper()->
       GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_1);
   infobar_1->Accept();
   CheckPermissionMessageSentForTab(0, bridge_id() + 1, true);
   extra_tabs_[0]->infobar_tab_helper()->RemoveInfoBar(infobar_1);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_1));
   infobar_1->InfoBarClosed();
-
-  extra_tabs_.reset();
 }
 
 TEST_F(GeolocationPermissionContextTests, TabDestroyed) {
   GURL requesting_frame_0("http://www.example.com/geolocation");
   GURL requesting_frame_1("http://www.example-2.com/geolocation");
   EXPECT_EQ(
       CONTENT_SETTING_ASK,
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           requesting_frame_0,
           requesting_frame_0,
@@ skipping 17 matching lines @@
       process_id(), render_id(), bridge_id() + 1, requesting_frame_1);
   // Ensure only one infobar is created.
   ASSERT_EQ(1U, infobar_tab_helper()->infobar_count());
   ConfirmInfoBarDelegate* infobar_0 = infobar_tab_helper()->
       GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
 
   // Delete the tab contents.
   DeleteContents();
   infobar_0->InfoBarClosed();
+
+  // During contents destruction, the infobar will have been closed, and a
+  // second (with it's own new delegate) will have been created. In Chromium,
+  // this would be properly deleted by the InfoBarContainer, but in this unit
+  // test, the closest thing we have to that is the ClosedDelegateTracker.
+  ASSERT_EQ(2U, closed_delegate_tracker_.size());
+  ASSERT_TRUE(closed_delegate_tracker_.Contains(infobar_0));
+  closed_delegate_tracker_.removed_infobar_delegates_.erase(infobar_0);
+  (*closed_delegate_tracker_.removed_infobar_delegates_.begin())->
+      InfoBarClosed();
 }
 
 TEST_F(GeolocationPermissionContextTests, InfoBarUsesCommittedEntry) {
   GURL requesting_frame_0("http://www.example.com/geolocation");
   GURL requesting_frame_1("http://www.example-2.com/geolocation");
   NavigateAndCommit(requesting_frame_0);
   NavigateAndCommit(requesting_frame_1);
   EXPECT_EQ(0U, infobar_tab_helper()->infobar_count());
   // Go back: navigate to a pending entry before requesting geolocation
   // permission.
@@ skipping 11 matching lines @@
   ASSERT_FALSE(infobar_0->ShouldExpire(details));
   // Commit the "GoBack()" above, and ensure the infobar is now expired.
   contents()->CommitPendingNavigation();
   details.entry = contents()->GetController().GetLastCommittedEntry();
   ASSERT_TRUE(infobar_0->ShouldExpire(details));
 
   // Delete the tab contents.
   DeleteContents();
   infobar_0->InfoBarClosed();
 }
+
+