Split InfoBarService core code into InfoBarManager

chrome/browser/android/tab_android.cc

Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 91e131c971624e4dd4e5326c10a96682c3184f89..9cf14f5af91a0f9da651ba8b0bb7a81643a48122 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -229,9 +229,14 @@ void TabAndroid::SwapTabContents(content::WebContents* old_contents,
           Java_Tab_getNativeInfoBarContainer(
               env,
               weak_java_tab_.get(env).obj()));
-  InfoBarService* new_infobar_service = new_contents ?
-      InfoBarService::FromWebContents(new_contents) : NULL;
-  infobar_container->ChangeInfoBarService(new_infobar_service);
+  InfoBarManager* new_infobar_manager = NULL;
+  if (new_contents) {
+    InfoBarService* new_infobar_service =
+        InfoBarService::FromWebContents(new_contents);
+    new_infobar_manager =
+        new_infobar_service ? new_infobar_service->infobar_manager() : NULL;
+  }
+  infobar_container->ChangeInfoBarManager(new_infobar_manager);
 
   Java_Tab_swapWebContents(
       env,