Move infobar handling to a tab helper.

chrome/browser/extensions/extension_install_ui_browsertest.cc

 // Copyright (c) 2011 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/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_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 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() {
     TabContentsWrapper* tab = browser()->GetSelectedTabContentsWrapper();
     ASSERT_TRUE(tab);
-    ASSERT_EQ(1U, tab->infobar_count());
-    ConfirmInfoBarDelegate* delegate =
-        tab->GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
+    InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper();
+    ASSERT_EQ(1U, infobar_helper->infobar_count());
+    ConfirmInfoBarDelegate* delegate = infobar_helper->
+        GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate();
     ASSERT_TRUE(delegate);
     delegate->Cancel();
-    ASSERT_EQ(0U, tab->infobar_count());
+    ASSERT_EQ(0U, infobar_helper->infobar_count());
   }
 
   const Extension* GetTheme() const {
     return ThemeServiceFactory::GetThemeForProfile(browser()->profile());
   }
 };
 
 // Flaky on linux. See http://crbug.com/86105
 #if defined(OS_LINUX)
 #define MAYBE_TestThemeInstallUndoResetsToDefault \
@@ skipping 86 matching lines @@
   ASSERT_TRUE(InstallExtensionWithUIAutoConfirm(app_dir, 1,
                                                 incognito_profile));
 
   EXPECT_EQ(num_incognito_tabs, incognito_browser->tab_count());
   EXPECT_EQ(num_normal_tabs + 1, browser()->tab_count());
   TabContents* tab_contents = browser()->GetSelectedTabContents();
   ASSERT_TRUE(tab_contents);
   EXPECT_TRUE(StartsWithASCII(tab_contents->GetURL().spec(),
                               "chrome://newtab/", false));
 }