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

chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java

Index: chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java
index bead036d8e8238852dfc624e8240d78e7b4e9062..6bcd00a9b39618e643a879c43eafdf2154ae896e 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java
@@ -10,7 +10,7 @@ import android.util.Pair;
 import org.chromium.base.CalledByNative;
 
 /**
- * Java equivalent of the C++ AutoLoginDelegate.
+ * Java equivalent of the C++ AutoLoginDelegateAndroid.
  *
  * Offers functionality to log in using the account in the system and keeps track
  * of all the native autologin infobars and their respective accounts.
@@ -95,8 +95,8 @@ public class AutoLoginDelegate {
         }
     }
 
-    private native void nativeLoginSuccess(long nativeAutoLoginInfoBarDelegate,
+    private native void nativeLoginSuccess(long nativeAutoLoginInfoBarDelegateAndroid,
             String result);
-    private native void nativeLoginFailed(long nativeAutoLoginInfoBarDelegate);
-    private native void nativeLoginDismiss(long nativeAutoLoginInfoBarDelegate);
+    private native void nativeLoginFailed(long nativeAutoLoginInfoBarDelegateAndroid);
+    private native void nativeLoginDismiss(long nativeAutoLoginInfoBarDelegateAndroid);
 }