Split InfoBarService core code into InfoBarManager

chrome/browser/ui/android/infobars/infobar_container_android.cc

 // Copyright 2013 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/ui/android/infobars/infobar_container_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/infobars/infobar.h"
@@ skipping 72 matching lines @@
 
 
 // Native JNI methods ---------------------------------------------------------
 
 static jlong Init(JNIEnv* env,
                   jobject obj,
                   jobject web_contents,
                   jobject auto_login_delegate) {
   InfoBarContainerAndroid* infobar_container =
       new InfoBarContainerAndroid(env, obj, auto_login_delegate);
-  infobar_container->ChangeInfoBarService(InfoBarService::FromWebContents(
-      content::WebContents::FromJavaWebContents(web_contents)));
+  InfoBarManager* infobar_manager =
+      InfoBarService::InfoBarManagerFromWebContents(
+          content::WebContents::FromJavaWebContents(web_contents));
+  infobar_container->ChangeInfoBarManager(infobar_manager);
   return reinterpret_cast<intptr_t>(infobar_container);
 }
 
 bool RegisterInfoBarContainer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }