Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/notifications/notification_browsertest.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 <deque>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
@@ skipping 326 matching lines @@
 void NotificationsTest::AllowAllOrigins() {
   GetDesktopNotificationService()->ResetAllOrigins();
   GetDesktopNotificationService()->SetDefaultContentSetting(
       CONTENT_SETTING_ALLOW);
 }
 
 void NotificationsTest::VerifyInfobar(const Browser* browser, int index) {
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
       browser->tab_strip_model()->GetWebContentsAt(index));
 
-  ASSERT_EQ(1U, infobar_service->GetInfoBarCount());
-  InfoBarDelegate* infobar = infobar_service->GetInfoBarDelegateAt(0);
+  ASSERT_EQ(1U, infobar_service->infobar_count());
+  InfoBarDelegate* infobar = infobar_service->infobar_at(0);
   ConfirmInfoBarDelegate* confirm_infobar = infobar->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(confirm_infobar);
   int buttons = confirm_infobar->GetButtons();
   EXPECT_TRUE(buttons & ConfirmInfoBarDelegate::BUTTON_OK);
   EXPECT_TRUE(buttons & ConfirmInfoBarDelegate::BUTTON_CANCEL);
 }
 
 std::string NotificationsTest::CreateNotification(
     Browser* browser,
     bool wait_for_new_balloon,
@@ skipping 62 matching lines @@
 }
 
 bool NotificationsTest::PerformActionOnInfobar(
     Browser* browser,
     InfobarAction action,
     int infobar_index,
     int tab_index) {
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
       browser->tab_strip_model()->GetWebContentsAt(tab_index));
 
-  InfoBarDelegate* infobar =
-      infobar_service->GetInfoBarDelegateAt(infobar_index);
+  InfoBarDelegate* infobar = infobar_service->infobar_at(infobar_index);
   switch (action) {
     case DISMISS:
       infobar->InfoBarDismissed();
       infobar_service->RemoveInfoBar(infobar);
       return true;
 
     case ALLOW: {
       ConfirmInfoBarDelegate* confirm_bar = infobar->AsConfirmInfoBarDelegate();
       if (confirm_bar->Accept()) {
         infobar_service->RemoveInfoBar(infobar);
@@ skipping 60 matching lines @@
   // Request permission by calling request() while eval'ing an inline script;
   // That's considered a user gesture to webkit, and should produce an infobar.
   bool result;
   ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "window.domAutomationController.send(request());",
       &result));
   EXPECT_TRUE(result);
 
   EXPECT_EQ(1U, InfoBarService::FromWebContents(
-      browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());
+      browser()->tab_strip_model()->GetWebContentsAt(0))->infobar_count());
 }
 
 // If this flakes, use http://crbug.com/62311.
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestNoUserGestureInfobar) {
   // Load a page which just does a request; no user gesture should result
   // in no infobar.
   ui_test_utils::NavigateToURL(
       browser(),
       test_server()->GetURL(
           "files/notifications/notifications_request_inline.html"));
 
   EXPECT_EQ(0U, InfoBarService::FromWebContents(
-      browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());
+      browser()->tab_strip_model()->GetWebContentsAt(0))->infobar_count());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateSimpleNotification) {
 #if defined(OS_MACOSX)
   // TODO(kbr): re-enable: http://crbug.com/222296
   if (base::mac::IsOSMountainLionOrLater())
     return;
 #endif
 
   // Creates a simple notification.
@@ skipping 131 matching lines @@
 #endif
   // Verify that all domains can be allowed to show notifications.
   SetDefaultPermissionSetting(CONTENT_SETTING_ALLOW);
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
 
   std::string result = CreateSimpleNotification(browser(), true);
   EXPECT_NE("-1", result);
 
   ASSERT_EQ(1, GetNotificationCount());
   EXPECT_EQ(0U, InfoBarService::FromWebContents(
-      browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());
+      browser()->tab_strip_model()->GetWebContentsAt(0))->infobar_count());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestDenyNotificationsFromAllSites) {
   // Verify that no domain can show notifications.
   SetDefaultPermissionSetting(CONTENT_SETTING_BLOCK);
   ui_test_utils::NavigateToURL(browser(), test_page_url_);
 
   std::string result = CreateSimpleNotification(browser(), false);
   EXPECT_EQ("-1", result);
 
@@ skipping 48 matching lines @@
   EXPECT_EQ("-1", result);
 
   ASSERT_EQ(0, GetNotificationCount());
 
   AllowOrigin(test_page_url_.GetOrigin());
   result = CreateSimpleNotification(browser(), true);
   EXPECT_NE("-1", result);
 
   ASSERT_EQ(1, GetNotificationCount());
   EXPECT_EQ(0U, InfoBarService::FromWebContents(
-      browser()->tab_strip_model()->GetWebContentsAt(0))->GetInfoBarCount());
+      browser()->tab_strip_model()->GetWebContentsAt(0))->infobar_count());
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationsTest, TestCreateDenyCloseNotifications) {
 #if defined(OS_MACOSX)
   // TODO(kbr): re-enable: http://crbug.com/222296
   if (base::mac::IsOSMountainLionOrLater())
     return;
 #endif
   // Verify able to create, deny, and close the notification.
   AllowAllOrigins();
@@ skipping 210 matching lines @@
   const std::deque<Balloon*>& balloons = GetActiveBalloons();
   ASSERT_EQ(1U, balloons.size());
   Balloon* balloon = balloons[0];
   const Notification& notification = balloon->notification();
   GURL EXPECTED_ICON_URL = test_server()->GetURL(kExpectedIconUrl);
   EXPECT_EQ(EXPECTED_ICON_URL, notification.icon_url());
   EXPECT_EQ(ASCIIToUTF16("Title2"), notification.title());
   EXPECT_EQ(ASCIIToUTF16("Body2"), notification.body());
 #endif
 }