Remove desktop auto-login since we don't plan on shipping it.

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

Index: chrome/browser/ui/android/infobars/auto_login_infobar_delegate.cc
diff --git a/chrome/browser/ui/auto_login_infobar_delegate.cc b/chrome/browser/ui/android/infobars/auto_login_infobar_delegate.cc
similarity index 67%
rename from chrome/browser/ui/auto_login_infobar_delegate.cc
rename to chrome/browser/ui/android/infobars/auto_login_infobar_delegate.cc
index 7929b7f925f98d96165be30870047d26c28ecc26..5a2235f91069249c94d73135cc44eca534c55230 100644
--- a/chrome/browser/ui/auto_login_infobar_delegate.cc
+++ b/chrome/browser/ui/android/infobars/auto_login_infobar_delegate.cc
@@ -2,8 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/auto_login_infobar_delegate.h"
+#include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate.h"
 
+#include "base/android/jni_android.h"
+#include "base/android/jni_helper.h"
+#include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ -15,6 +18,7 @@
 #include "chrome/browser/google/google_util.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/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ -40,13 +44,13 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "jni/AutoLoginDelegate_jni.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.h"
-#endif
+using base::android::ConvertUTF8ToJavaString;
+using base::android::ScopedJavaLocalRef;
 
 
 // AutoLoginRedirector --------------------------------------------------------
@@ -149,13 +153,9 @@ bool AutoLoginInfoBarDelegate::Create(content::WebContents* web_contents,
 
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
-#if defined(OS_ANDROID)
-  typedef AutoLoginInfoBarDelegateAndroid Delegate;
-#else
-  typedef AutoLoginInfoBarDelegate Delegate;
-#endif
   return !!infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new Delegate(params, profile))));
+      scoped_ptr<ConfirmInfoBarDelegate>(
+          new AutoLoginInfoBarDelegate(params, profile))));
 }
 
 AutoLoginInfoBarDelegate::AutoLoginInfoBarDelegate(const Params& params,
@@ -173,6 +173,67 @@ AutoLoginInfoBarDelegate::~AutoLoginInfoBarDelegate() {
     RecordHistogramAction(IGNORED);
 }
 
+bool AutoLoginInfoBarDelegate::AttachAccount(
+    JavaObjectWeakGlobalRef weak_java_auto_login_delegate) {
+  weak_java_auto_login_delegate_ = weak_java_auto_login_delegate;
+  JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jstring> jrealm = ConvertUTF8ToJavaString(env, realm());
+  ScopedJavaLocalRef<jstring> jaccount =
+      ConvertUTF8ToJavaString(env, account());
+  ScopedJavaLocalRef<jstring> jargs = ConvertUTF8ToJavaString(env, args());
+  DCHECK(!jrealm.is_null());
+  DCHECK(!jaccount.is_null());
+  DCHECK(!jargs.is_null());
+
+  ScopedJavaLocalRef<jobject> delegate =
+      weak_java_auto_login_delegate_.get(env);
+  DCHECK(delegate.obj());
+  user_ = base::android::ConvertJavaStringToUTF8(
+      Java_AutoLoginDelegate_initializeAccount(
+          env, delegate.obj(), reinterpret_cast<intptr_t>(this), jrealm.obj(),
+          jaccount.obj(), jargs.obj()));
+  return !user_.empty();
+}
+
+void AutoLoginInfoBarDelegate::LoginSuccess(JNIEnv* env,
+                                                   jobject obj,
+                                                   jstring result) {
+  if (!infobar()->owner())
+     return;  // We're closing; don't call anything, it might access the owner.
+
+  // TODO(miguelg): Test whether the Stop() and RemoveInfoBar() calls here are
+  // necessary, or whether OpenURL() will do this for us.
+  content::WebContents* contents = web_contents();
+  contents->Stop();
+  infobar()->RemoveSelf();
+  // WARNING: |this| may be deleted at this point!  Do not access any members!
+  contents->OpenURL(content::OpenURLParams(
+      GURL(base::android::ConvertJavaStringToUTF8(env, result)),
+      content::Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_AUTO_BOOKMARK,
+      false));
+}
+
+void AutoLoginInfoBarDelegate::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().
+  SimpleAlertInfoBarDelegate::Create(
+      infobar()->owner(), IDR_INFOBAR_WARNING,
+      l10n_util::GetStringUTF16(IDS_AUTO_LOGIN_FAILED), false);
+  infobar()->RemoveSelf();
+}
+
+void AutoLoginInfoBarDelegate::LoginDismiss(JNIEnv* env, jobject obj) {
+  infobar()->RemoveSelf();
+}
+
+bool AutoLoginInfoBarDelegate::Register(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
 void AutoLoginInfoBarDelegate::InfoBarDismissed() {
   RecordHistogramAction(DISMISSED);
   button_pressed_ = true;
@@ -193,7 +254,7 @@ AutoLoginInfoBarDelegate*
 
 base::string16 AutoLoginInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_AUTOLOGIN_INFOBAR_MESSAGE,
-                                    base::UTF8ToUTF16(params_.username));
+                                    base::UTF8ToUTF16(user_));
 }
 
 base::string16 AutoLoginInfoBarDelegate::GetButtonLabel(
@@ -203,19 +264,24 @@ base::string16 AutoLoginInfoBarDelegate::GetButtonLabel(
 }
 
 bool AutoLoginInfoBarDelegate::Accept() {
-  // AutoLoginRedirector deletes itself.
-  new AutoLoginRedirector(web_contents(), params_.header.args);
-  RecordHistogramAction(ACCEPTED);
-  button_pressed_ = true;
-  return true;
+  JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> delegate =
+      weak_java_auto_login_delegate_.get(env);
+  DCHECK(delegate.obj());
+  Java_AutoLoginDelegate_logIn(env, delegate.obj(),
+                               reinterpret_cast<intptr_t>(this));
+  // Do not close the infobar on accept, it will be closed as part
+  // of the log in callback.
+  return false;
 }
 
 bool AutoLoginInfoBarDelegate::Cancel() {
-  PrefService* pref_service = Profile::FromBrowserContext(
-      web_contents()->GetBrowserContext())->GetPrefs();
-  pref_service->SetBoolean(prefs::kAutologinEnabled, false);
-  RecordHistogramAction(REJECTED);

[nyquist, 2014/03/03 17:56:29]

Does this histogram go away now?

[Roger Tawa OOO till Jul 10th, 2014/03/04 20:32:34]

Its possible this will no longer be recorded.  I'll take a look, but I think we
need to keep histogram definition so that we can continue ti see historical
data.  If not, I'll remove in a follow up CL.

-  button_pressed_ = true;
+  JNIEnv* env = base::android::AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> delegate =
+      weak_java_auto_login_delegate_.get(env);
+  DCHECK(delegate.obj());
+  Java_AutoLoginDelegate_cancelLogIn(env, delegate.obj(),
+                                     reinterpret_cast<intptr_t>(this));
   return true;
 }