Infobar Componentization Proof of Concept

chrome/browser/infobars/infobars_browsertest.cc

Index: chrome/browser/infobars/infobars_browsertest.cc
diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc
index aa68737f4156f52746a81fac9661f53a6a126bba..e65cbb152ca074f7019e346b8d05e852fc24b72e 100644
--- a/chrome/browser/infobars/infobars_browsertest.cc
+++ b/chrome/browser/infobars/infobars_browsertest.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
@@ -83,8 +84,10 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) {
   infobar_added_2.Wait();
   infobar_removed_1.Wait();
   EXPECT_EQ(0u,
-            InfoBarService::FromWebContents(browser()->tab_strip_model()->
-                GetWebContentsAt(0))->infobar_count());
+            InfoBarService::FromWebContents(
+                browser()->tab_strip_model()->GetWebContentsAt(0))
+                ->infobar_manager()
+                .infobar_count());

[Peter Kasting, 2014/03/18 18:29:17]

Nit: Old wrapping was correct (2 places)

 
   content::WindowedNotificationObserver infobar_removed_2(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
@@ -92,6 +95,8 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) {
   ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme();
   infobar_removed_2.Wait();
   EXPECT_EQ(0u,
-            InfoBarService::FromWebContents(browser()->tab_strip_model()->
-                GetActiveWebContents())->infobar_count());
+            InfoBarService::FromWebContents(
+                browser()->tab_strip_model()->GetActiveWebContents())
+                ->infobar_manager()
+                .infobar_count());
 }