Split InfoBarService core code into InfoBarManager

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

 // Copyright 2014 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/auto_login_infobar_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_helper.h"
 #include "base/android/jni_string.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar.h"
+#include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/infobars/simple_alert_infobar_delegate.h"
 #include "chrome/browser/ui/auto_login_infobar_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "jni/AutoLoginDelegate_jni.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
@@ skipping 76 matching lines @@
       false));
 }
 
 void AutoLoginInfoBarDelegateAndroid::LoginFailed(JNIEnv* env, jobject obj) {
   if (!infobar()->owner())
      return;  // We're closing; don't call anything, it might access the owner.
 
   // TODO(miguelg): Using SimpleAlertInfoBarDelegate::Create() animates in a new
   // infobar while we animate the current one closed.  It would be better to use
   // ReplaceInfoBar().
+  InfoBarService* infobar_service =
+      InfoBarService::FromWebContents(web_contents());
+  DCHECK(infobar_service);
   SimpleAlertInfoBarDelegate::Create(
-      infobar()->owner(), IDR_INFOBAR_WARNING,
+      infobar_service, IDR_INFOBAR_WARNING,

[droger, 2014/03/26 17:44:45]

Note: this particular change is not trivial.

       l10n_util::GetStringUTF16(IDS_AUTO_LOGIN_FAILED), false);
   infobar()->RemoveSelf();
 }
 
 void AutoLoginInfoBarDelegateAndroid::LoginDismiss(JNIEnv* env, jobject obj) {
   infobar()->RemoveSelf();
 }
 
 bool AutoLoginInfoBarDelegateAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }