Revert "Remove desktop auto-login since we don't plan on shipping it there. Refactor the base and …

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"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate.h"
+#include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.h"
 #include "chrome/browser/ui/android/infobars/infobar_android.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/InfoBarContainer_jni.h"
 
 
 // InfoBarContainerAndroid ----------------------------------------------------
 
 InfoBarContainerAndroid::InfoBarContainerAndroid(JNIEnv* env,
                                                  jobject obj,
                                                  jobject auto_login_delegate)
@@ skipping 17 matching lines @@
   if (!android_bar) {
     // TODO(bulach): CLANK: implement other types of InfoBars.
     // TODO(jrg): this will always print out WARNING_TYPE as an int.
     // Try and be more helpful.
     NOTIMPLEMENTED() << "CLANK: infobar type "
                      << infobar->delegate()->GetInfoBarType();
     return;
   }
 
   if (infobar->delegate()->AsAutoLoginInfoBarDelegate()) {
-    AutoLoginInfoBarDelegate* auto_login_delegate =
-        static_cast<AutoLoginInfoBarDelegate*>(
+    AutoLoginInfoBarDelegateAndroid* auto_login_delegate =
+        static_cast<AutoLoginInfoBarDelegateAndroid*>(
             infobar->delegate()->AsAutoLoginInfoBarDelegate());
     if (!auto_login_delegate->AttachAccount(weak_java_auto_login_delegate_))
       return;
   }
 
   AttachJavaInfoBar(android_bar);
 }
 
 void InfoBarContainerAndroid::AttachJavaInfoBar(InfoBarAndroid* android_bar) {
   if (android_bar->HasSetJavaInfoBar())
@@ skipping 28 matching lines @@
   InfoBarContainerAndroid* infobar_container =
       new InfoBarContainerAndroid(env, obj, auto_login_delegate);
   infobar_container->ChangeInfoBarService(InfoBarService::FromWebContents(
       content::WebContents::FromJavaWebContents(web_contents)));
   return reinterpret_cast<intptr_t>(infobar_container);
 }
 
 bool RegisterInfoBarContainer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }