Split InfoBarService core code into InfoBarManager

chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc

Index: chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
index 316dad322e014b114329a62c38c335c829fcbf95..97701e9371114a405a68c0b17fa7566b8aebe29f 100644
--- a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
+++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
@@ -8,6 +8,7 @@
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/infobars/infobar.h"
+#include "chrome/browser/infobars/infobar_manager.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/sessions/session_service_factory.h"
@@ -81,11 +82,11 @@ TEST_F(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) {
   TabStripModel* tab_strip = first_browser->tab_strip_model();
   ASSERT_EQ(1, tab_strip->count());
   content::WebContents* web_contents = tab_strip->GetWebContentsAt(0);
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents);
-  EXPECT_EQ(1U, infobar_service->infobar_count());
+  InfoBarManager* infobar_manager =
+      InfoBarService::FromWebContents(web_contents)->infobar_manager();
+  EXPECT_EQ(1U, infobar_manager->infobar_count());
   ConfirmInfoBarDelegate* infobar =
-      infobar_service->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();
+      infobar_manager->infobar_at(0)->delegate()->AsConfirmInfoBarDelegate();
   ASSERT_TRUE(infobar);
 
   // Open another browser.
@@ -102,9 +103,9 @@ TEST_F(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) {
   first_browser.reset();
 
   ASSERT_EQ(1, tab_strip->count());
-  web_contents = tab_strip->GetWebContentsAt(0);
-  infobar_service = InfoBarService::FromWebContents(web_contents);
-  EXPECT_EQ(1U, infobar_service->infobar_count());
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(tab_strip->GetWebContentsAt(0));
+  EXPECT_EQ(1U, infobar_service->infobar_manager()->infobar_count());
 
   // This used to crash.
   infobar->Accept();