Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

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 267 matching lines @@
       base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
   done.Wait();
   db_thread_.Stop();
 }
 
 // Tests ----------------------------------------------------------------------
 
 TEST_F(GeolocationPermissionContextTests, SinglePermission) {
   GURL requesting_frame("http://www.example.com/geolocation");
   NavigateAndCommit(requesting_frame);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   RequestGeolocationPermission(RequestID(0), requesting_frame);
-  ASSERT_EQ(1U, infobar_service()->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service()->infobar_count());
   ConfirmInfoBarDelegate* infobar_0 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   infobar_0->Cancel();
   infobar_service()->RemoveInfoBar(infobar_0);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_0));
   delete infobar_0;
 }
 
 #if defined(OS_ANDROID)
 TEST_F(GeolocationPermissionContextTests, GeolocationEnabledDisabled) {
   GURL requesting_frame("http://www.example.com/geolocation");
   NavigateAndCommit(requesting_frame);
   MockGoogleLocationSettingsHelper::SetLocationStatus(true, true);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   RequestGeolocationPermission(RequestID(0), requesting_frame);
-  EXPECT_EQ(1U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(1U, infobar_service()->infobar_count());
   ConfirmInfoBarDelegate* infobar_0 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
   string16 text_0 = infobar_0->GetButtonLabel(
       ConfirmInfoBarDelegate::BUTTON_OK);
 
   NavigateAndCommit(requesting_frame);
   MockGoogleLocationSettingsHelper::SetLocationStatus(true, false);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   RequestGeolocationPermission(RequestID(0), requesting_frame);
-  EXPECT_EQ(1U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(1U, infobar_service()->infobar_count());
   ConfirmInfoBarDelegate* infobar_1 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_1);
   string16 text_1 = infobar_1->GetButtonLabel(
       ConfirmInfoBarDelegate::BUTTON_OK);
   EXPECT_NE(text_0, text_1);
 
   NavigateAndCommit(requesting_frame);
   MockGoogleLocationSettingsHelper::SetLocationStatus(false, false);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   RequestGeolocationPermission(RequestID(0), requesting_frame);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
 }
 
 TEST_F(GeolocationPermissionContextTests, MasterEnabledGoogleAppsEnabled) {
   GURL requesting_frame("http://www.example.com/geolocation");
   NavigateAndCommit(requesting_frame);
   MockGoogleLocationSettingsHelper::SetLocationStatus(true, true);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   RequestGeolocationPermission(RequestID(0), requesting_frame);
-  EXPECT_EQ(1U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(1U, infobar_service()->infobar_count());
   ConfirmInfoBarDelegate* infobar_0 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
   infobar_0->Accept();
   CheckTabContentsState(requesting_frame, CONTENT_SETTING_ALLOW);
   CheckPermissionMessageSent(0, true);
 }
 
 TEST_F(GeolocationPermissionContextTests, MasterEnabledGoogleAppsDisabled) {
   GURL requesting_frame("http://www.example.com/geolocation");
   NavigateAndCommit(requesting_frame);
   MockGoogleLocationSettingsHelper::SetLocationStatus(true, false);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   RequestGeolocationPermission(RequestID(0), requesting_frame);
-  EXPECT_EQ(1U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(1U, infobar_service()->infobar_count());
   ConfirmInfoBarDelegate* infobar_0 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
   infobar_0->Accept();
   EXPECT_TRUE(
       MockGoogleLocationSettingsHelper::WasGoogleLocationSettingsCalled());
 }
 #endif
 
 TEST_F(GeolocationPermissionContextTests, QueuedPermission) {
   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,
           CONTENT_SETTINGS_TYPE_GEOLOCATION,
           std::string()));
   EXPECT_EQ(CONTENT_SETTING_ASK,
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           requesting_frame_1,
           requesting_frame_0,
           CONTENT_SETTINGS_TYPE_GEOLOCATION,
           std::string()));
 
 
   NavigateAndCommit(requesting_frame_0);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   // Request permission for two frames.
   RequestGeolocationPermission(RequestID(0), requesting_frame_0);
   RequestGeolocationPermission(RequestID(1), requesting_frame_1);
   // Ensure only one infobar is created.
-  ASSERT_EQ(1U, infobar_service()->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service()->infobar_count());
   ConfirmInfoBarDelegate* infobar_0 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
   string16 text_0 = infobar_0->GetMessageText();
 
   // Accept the first frame.
   infobar_0->Accept();
   CheckTabContentsState(requesting_frame_0, CONTENT_SETTING_ALLOW);
   CheckPermissionMessageSent(0, true);
 
   infobar_service()->RemoveInfoBar(infobar_0);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_0));
   closed_delegate_tracker_.Clear();
   delete infobar_0;
   // Now we should have a new infobar for the second frame.
-  ASSERT_EQ(1U, infobar_service()->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service()->infobar_count());
 
   ConfirmInfoBarDelegate* infobar_1 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_1);
   string16 text_1 = infobar_1->GetMessageText();
   EXPECT_NE(text_0, text_1);
 
   // Cancel (block) this frame.
   infobar_1->Cancel();
   CheckTabContentsState(requesting_frame_1, CONTENT_SETTING_BLOCK);
   CheckPermissionMessageSent(1, false);
   infobar_service()->RemoveInfoBar(infobar_1);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_1));
   delete infobar_1;
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   // Ensure the persisted permissions are ok.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           requesting_frame_0,
           requesting_frame_0,
           CONTENT_SETTINGS_TYPE_GEOLOCATION,
           std::string()));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           requesting_frame_1,
           requesting_frame_0,
           CONTENT_SETTINGS_TYPE_GEOLOCATION,
           std::string()));
 }
 
 TEST_F(GeolocationPermissionContextTests, PermissionForFileScheme) {
   GURL requesting_frame("file://example/geolocation.html");
   NavigateAndCommit(requesting_frame);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   RequestGeolocationPermission(RequestID(0), requesting_frame);
-  EXPECT_EQ(1U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(1U, infobar_service()->infobar_count());
   ConfirmInfoBarDelegate* infobar =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar);
   // Accept the frame
   infobar->Accept();
   CheckTabContentsState(requesting_frame, CONTENT_SETTING_ALLOW);
   CheckPermissionMessageSent(0, true);
   infobar_service()->RemoveInfoBar(infobar);
   delete infobar;
 
   // Make sure the setting is not stored.
   EXPECT_EQ(CONTENT_SETTING_ASK,
@@ skipping 16 matching lines @@
 
   EXPECT_EQ(CONTENT_SETTING_ASK,
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           requesting_frame_1,
           requesting_frame_0,
           CONTENT_SETTINGS_TYPE_GEOLOCATION,
           std::string()));
 
 
   NavigateAndCommit(requesting_frame_0);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   // Request permission for two frames.
   RequestGeolocationPermission(RequestID(0), requesting_frame_0);
   RequestGeolocationPermission(RequestID(1), requesting_frame_1);
-  ASSERT_EQ(1U, infobar_service()->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service()->infobar_count());
 
   ConfirmInfoBarDelegate* infobar_0 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
   string16 text_0 = infobar_0->GetMessageText();
 
   // Simulate the frame going away, ensure the infobar for this frame
   // is removed and the next pending infobar is created.
   CancelGeolocationPermissionRequest(RequestID(0), requesting_frame_0);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_0));
   closed_delegate_tracker_.Clear();
   delete infobar_0;
-  ASSERT_EQ(1U, infobar_service()->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service()->infobar_count());
 
   ConfirmInfoBarDelegate* infobar_1 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_1);
   string16 text_1 = infobar_1->GetMessageText();
   EXPECT_NE(text_0, text_1);
 
   // Allow this frame.
   infobar_1->Accept();
   CheckTabContentsState(requesting_frame_1, CONTENT_SETTING_ALLOW);
   CheckPermissionMessageSent(1, true);
   infobar_service()->RemoveInfoBar(infobar_1);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_1));
   delete infobar_1;
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   // Ensure the persisted permissions are ok.
   EXPECT_EQ(CONTENT_SETTING_ASK,
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           requesting_frame_0,
           requesting_frame_0,
           CONTENT_SETTINGS_TYPE_GEOLOCATION,
           std::string()));
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           requesting_frame_1,
           requesting_frame_0,
           CONTENT_SETTINGS_TYPE_GEOLOCATION,
           std::string()));
 }
 
 TEST_F(GeolocationPermissionContextTests, InvalidURL) {
   GURL invalid_embedder("about:blank");
   GURL requesting_frame;
   NavigateAndCommit(invalid_embedder);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   RequestGeolocationPermission(RequestID(0), requesting_frame);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   CheckPermissionMessageSent(0, false);
 }
 
 TEST_F(GeolocationPermissionContextTests, SameOriginMultipleTabs) {
   GURL url_a("http://www.example.com/geolocation");
   GURL url_b("http://www.example-2.com/geolocation");
   NavigateAndCommit(url_a);
   AddNewTab(url_b);
   AddNewTab(url_a);
 
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   RequestGeolocationPermission(RequestID(0), url_a);
-  ASSERT_EQ(1U, infobar_service()->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service()->infobar_count());
 
   RequestGeolocationPermission(RequestIDForTab(0, 0), url_b);
-  EXPECT_EQ(1U, infobar_service_for_tab(0)->GetInfoBarCount());
+  EXPECT_EQ(1U, infobar_service_for_tab(0)->infobar_count());
 
   RequestGeolocationPermission(RequestIDForTab(1, 0), url_a);
-  ASSERT_EQ(1U, infobar_service_for_tab(1)->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service_for_tab(1)->infobar_count());
 
-  ConfirmInfoBarDelegate* removed_infobar = infobar_service_for_tab(1)->
-      GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+  ConfirmInfoBarDelegate* removed_infobar =
+      infobar_service_for_tab(1)->infobar_at(0)->AsConfirmInfoBarDelegate();
 
   // Accept the first tab.
   ConfirmInfoBarDelegate* infobar_0 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
   infobar_0->Accept();
   CheckPermissionMessageSent(0, true);
   infobar_service()->RemoveInfoBar(infobar_0);
   EXPECT_EQ(2U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_0));
   delete infobar_0;
   // Now the infobar for the tab with the same origin should have gone.
-  EXPECT_EQ(0U, infobar_service_for_tab(1)->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service_for_tab(1)->infobar_count());
   CheckPermissionMessageSentForTab(1, 0, true);
   EXPECT_TRUE(closed_delegate_tracker_.Contains(removed_infobar));
   closed_delegate_tracker_.Clear();
   // Destroy the infobar that has just been removed.
   delete removed_infobar;
 
   // But the other tab should still have the info bar...
-  ASSERT_EQ(1U, infobar_service_for_tab(0)->GetInfoBarCount());
-  ConfirmInfoBarDelegate* infobar_1 = infobar_service_for_tab(0)->
-      GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+  ASSERT_EQ(1U, infobar_service_for_tab(0)->infobar_count());
+  ConfirmInfoBarDelegate* infobar_1 =
+      infobar_service_for_tab(0)->infobar_at(0)->AsConfirmInfoBarDelegate();
   infobar_1->Cancel();
   infobar_service_for_tab(0)->RemoveInfoBar(infobar_1);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_1));
   delete infobar_1;
 }
 
 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_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   RequestGeolocationPermission(RequestID(0), url_a);
-  ASSERT_EQ(1U, infobar_service()->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service()->infobar_count());
 
   RequestGeolocationPermission(RequestIDForTab(0, 0), url_a);
-  EXPECT_EQ(1U, infobar_service_for_tab(0)->GetInfoBarCount());
+  EXPECT_EQ(1U, infobar_service_for_tab(0)->infobar_count());
 
   RequestGeolocationPermission(RequestIDForTab(0, 1), url_b);
-  ASSERT_EQ(1U, infobar_service_for_tab(0)->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service_for_tab(0)->infobar_count());
 
   ConfirmInfoBarDelegate* removed_infobar =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
 
   // Accept the second tab.
-  ConfirmInfoBarDelegate* infobar_0 = infobar_service_for_tab(0)->
-      GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+  ConfirmInfoBarDelegate* infobar_0 =
+      infobar_service_for_tab(0)->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
   infobar_0->Accept();
   CheckPermissionMessageSentForTab(0, 0, true);
   infobar_service_for_tab(0)->RemoveInfoBar(infobar_0);
   EXPECT_EQ(2U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_0));
   delete infobar_0;
   // Now the infobar for the tab with the same origin should have gone.
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   CheckPermissionMessageSent(0, true);
   EXPECT_TRUE(closed_delegate_tracker_.Contains(removed_infobar));
   closed_delegate_tracker_.Clear();
   // Destroy the infobar that has just been removed.
   delete removed_infobar;
 
   // And we should have the queued infobar displayed now.
-  ASSERT_EQ(1U, infobar_service_for_tab(0)->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service_for_tab(0)->infobar_count());
 
   // Accept the second infobar.
-  ConfirmInfoBarDelegate* infobar_1 = infobar_service_for_tab(0)->
-      GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+  ConfirmInfoBarDelegate* infobar_1 =
+      infobar_service_for_tab(0)->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_1);
   infobar_1->Accept();
   CheckPermissionMessageSentForTab(0, 1, true);
   infobar_service_for_tab(0)->RemoveInfoBar(infobar_1);
   EXPECT_EQ(1U, closed_delegate_tracker_.size());
   EXPECT_TRUE(closed_delegate_tracker_.Contains(infobar_1));
   delete infobar_1;
 }
 
 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,
           CONTENT_SETTINGS_TYPE_GEOLOCATION,
           std::string()));
 
   EXPECT_EQ(
       CONTENT_SETTING_ASK,
       profile()->GetHostContentSettingsMap()->GetContentSetting(
           requesting_frame_1,
           requesting_frame_0,
           CONTENT_SETTINGS_TYPE_GEOLOCATION,
           std::string()));
 
   NavigateAndCommit(requesting_frame_0);
-  EXPECT_EQ(0U, infobar_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   // Request permission for two frames.
   RequestGeolocationPermission(RequestID(0), requesting_frame_0);
   RequestGeolocationPermission(RequestID(1), requesting_frame_1);
   // Ensure only one infobar is created.
-  ASSERT_EQ(1U, infobar_service()->GetInfoBarCount());
+  ASSERT_EQ(1U, infobar_service()->infobar_count());
   ConfirmInfoBarDelegate* infobar_0 =
-      infobar_service()->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+      infobar_service()->infobar_at(0)->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar_0);
 
   // Delete the tab contents.
   DeleteContents();
   delete infobar_0;
 
   // During contents destruction, the infobar will have been closed, and the
   // pending request should have been cleared without an infobar being created.
   ASSERT_EQ(1U, closed_delegate_tracker_.size());
   ASSERT_TRUE(closed_delegate_tracker_.Contains(infobar_0));
 }
 
 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_service()->GetInfoBarCount());
+  EXPECT_EQ(0U, infobar_service()->infobar_count());
   // Go back: navigate to a pending entry before requesting geolocation
   // permission.
   web_contents()->GetController().GoBack();
   // Request permission for the committed frame (not the pending one).
   RequestGeolocationPermission(RequestID(0), requesting_frame_1);
   // Ensure the infobar is created.
-  ASSERT_EQ(1U, infobar_service()->GetInfoBarCount());
-  InfoBarDelegate* infobar_0 = infobar_service()->GetInfoBarDelegateAt(0);
+  ASSERT_EQ(1U, infobar_service()->infobar_count());
+  InfoBarDelegate* infobar_0 = infobar_service()->infobar_at(0);
   ASSERT_TRUE(infobar_0);
   // Ensure the infobar wouldn't expire for a navigation to the committed entry.
   content::LoadCommittedDetails details;
   details.entry = web_contents()->GetController().GetLastCommittedEntry();
   EXPECT_FALSE(infobar_0->ShouldExpire(details));
   // Ensure the infobar will expire when we commit the pending navigation.
   details.entry = web_contents()->GetController().GetActiveEntry();
   EXPECT_TRUE(infobar_0->ShouldExpire(details));
 
   // Delete the tab contents.
   DeleteContents();
   delete infobar_0;
 }