Split InfoBarService core code into InfoBarManager

chrome/browser/extensions/extension_install_ui_browsertest.cc

Index: chrome/browser/extensions/extension_install_ui_browsertest.cc
diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc
index ca70ad80e628775fc1270282768c4442e00126f8..8241650ae13c0b7af0a4b5658747875a59b693fa 100644
--- a/chrome/browser/extensions/extension_install_ui_browsertest.cc
+++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.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"
@@ -40,14 +41,14 @@ class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest {
     WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents);
-    InfoBarService* infobar_service =
-        InfoBarService::FromWebContents(web_contents);
-    ASSERT_EQ(1U, infobar_service->infobar_count());
+    InfoBarManager& infobar_manager =
+        InfoBarService::FromWebContents(web_contents)->infobar_manager();
+    ASSERT_EQ(1U, infobar_manager.infobar_count());
     ConfirmInfoBarDelegate* delegate =
-        infobar_service->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();
+        infobar_manager.infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();
     ASSERT_TRUE(delegate);
     delegate->Cancel();
-    ASSERT_EQ(0U, infobar_service->infobar_count());
+    ASSERT_EQ(0U, infobar_manager.infobar_count());
   }
 
   // Install the given theme from the data dir and verify expected name.