Split InfoBarService core code into InfoBarManager

chrome/browser/android/tab_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/tab_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/debug/trace_event.h"
@@ skipping 211 matching lines @@
                                  bool did_start_load,
                                  bool did_finish_load) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   // We need to notify the native InfobarContainer so infobars can be swapped.
   InfoBarContainerAndroid* infobar_container =
       reinterpret_cast<InfoBarContainerAndroid*>(
           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,
       weak_java_tab_.get(env).obj(),
       reinterpret_cast<intptr_t>(new_contents),
       did_start_load,
       did_finish_load);
 }
 
 void TabAndroid::Observe(int type,
@@ skipping 267 matching lines @@
 
 static void Init(JNIEnv* env, jobject obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }