Eliminate InfoBarTabHelper. Make InfoBarService a concrete class.

chrome/browser/extensions/extension_install_ui_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 "base/string_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
@@ skipping 13 matching lines @@
 class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest {
  public:
   // Checks that a theme info bar is currently visible and issues an undo to
   // revert to the previous theme.
   void VerifyThemeInfoBarAndUndoInstall() {
     WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents);
     InfoBarService* infobar_service =
         InfoBarService::FromWebContents(web_contents);
-    ASSERT_EQ(1U, infobar_service->GetInfoBarCount());
-    ConfirmInfoBarDelegate* delegate = infobar_service->
-        GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+    ASSERT_EQ(1U, infobar_service->infobar_count());
+    ConfirmInfoBarDelegate* delegate =
+        infobar_service->infobar_at(0)->AsConfirmInfoBarDelegate();
     ASSERT_TRUE(delegate);
     delegate->Cancel();
-    ASSERT_EQ(0U, infobar_service->GetInfoBarCount());
+    ASSERT_EQ(0U, infobar_service->infobar_count());
   }
 
   // Install the given theme from the data dir and verify expected name.
   void InstallThemeAndVerify(const char* theme_name,
                              const std::string& expected_name) {
     const base::FilePath theme_path = test_data_dir_.AppendASCII(theme_name);
     ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(theme_path, 1, browser()));
     const Extension* theme = GetTheme();
     ASSERT_TRUE(theme);
     ASSERT_EQ(theme->name(), expected_name);
@@ skipping 104 matching lines @@
     EXPECT_EQ(num_normal_tabs + 1, browser()->tab_strip_model()->count());
     WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents);
     EXPECT_TRUE(StartsWithASCII(web_contents->GetURL().spec(),
                                 "chrome://newtab/", false));
   } else {
     // TODO(xiyuan): Figure out how to test extension installed bubble?
   }
 }