Split InfoBarService core code into InfoBarManager

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..3918102409f3ae05cd06ffc9d317163208cdacd5 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"
@@ -84,7 +85,7 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) {
   infobar_removed_1.Wait();
   EXPECT_EQ(0u,
             InfoBarService::FromWebContents(browser()->tab_strip_model()->
-                GetWebContentsAt(0))->infobar_count());
+                GetWebContentsAt(0))->infobar_manager().infobar_count());
 
   content::WindowedNotificationObserver infobar_removed_2(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
@@ -93,5 +94,5 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) {
   infobar_removed_2.Wait();
   EXPECT_EQ(0u,
             InfoBarService::FromWebContents(browser()->tab_strip_model()->
-                GetActiveWebContents())->infobar_count());
+                GetActiveWebContents())->infobar_manager().infobar_count());
 }