Split InfoBarService core code into InfoBarManager

chrome/test/gpu/webgl_infobar_browsertest.cc

Index: chrome/test/gpu/webgl_infobar_browsertest.cc
diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc
index 8040cae48367aaa7c924bdb59ae846f786cc0be0..9d376d3ea8d584fffa9d3c0419e67aae1aec1c91 100644
--- a/chrome/test/gpu/webgl_infobar_browsertest.cc
+++ b/chrome/test/gpu/webgl_infobar_browsertest.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/chrome_notification_types.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/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ -90,8 +91,8 @@ IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossRaisesInfoBar) {
   infobar_added.Wait();
   EXPECT_EQ(1u,
             InfoBarService::FromWebContents(
-                browser()->tab_strip_model()->GetActiveWebContents())->
-                    infobar_count());
+                browser()->tab_strip_model()->GetActiveWebContents())
+                    ->infobar_manager()->infobar_count());
 }
 
 // This test is flaky. http://crbug.com/324555
@@ -131,8 +132,9 @@ IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossInfoBarReload) {
   infobar_added.Wait();
   InfoBarService* infobar_service = InfoBarService::FromWebContents(
       browser()->tab_strip_model()->GetActiveWebContents());
-  ASSERT_EQ(1u, infobar_service->infobar_count());
-  InfoBarDelegate* delegate = infobar_service->infobar_at(0)->delegate();
+  ASSERT_EQ(1u, infobar_service->infobar_manager()->infobar_count());
+  InfoBarDelegate* delegate =
+      infobar_service->infobar_manager()->infobar_at(0)->delegate();
   ASSERT_EQ(IDR_INFOBAR_3D_BLOCKED, delegate->GetIconID());
   delegate->AsConfirmInfoBarDelegate()->Cancel();