Move infobar handling to a tab helper, part 1.

Revert revert of r99187.

This reverts r99198.

BUG=94741
TEST=no visible change

Review URL: http://codereview.chromium.org/7810002

TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/7827017

Review URL: http://codereview.chromium.org/7826014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99222 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc
index 23ddbb7..1ac2196 100644
--- a/chrome/browser/extensions/extension_install_ui_browsertest.cc
+++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc
@@ -6,6 +6,7 @@
 #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"
@@ -20,12 +21,13 @@ class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest {
   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 {