Cleanup upstreamed Android infobar code.

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

Index: chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc
===================================================================
--- chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc	(revision 225262)
+++ chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.cc	(working copy)
@@ -16,38 +16,37 @@
 #include "jni/AutoLoginDelegate_jni.h"
 #include "ui/base/l10n/l10n_util.h"
 
-using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
-using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 
 AutoLoginInfoBarDelegateAndroid::AutoLoginInfoBarDelegateAndroid(
     InfoBarService* owner,
     const Params& params)
-    : AutoLoginInfoBarDelegate(owner, params), params_(params) {}
+    : AutoLoginInfoBarDelegate(owner, params),
+      params_(params) {
+}
 
-AutoLoginInfoBarDelegateAndroid::~AutoLoginInfoBarDelegateAndroid() {}
+AutoLoginInfoBarDelegateAndroid::~AutoLoginInfoBarDelegateAndroid() {
+}
 
 bool AutoLoginInfoBarDelegateAndroid::AttachAccount(
     JavaObjectWeakGlobalRef weak_java_auto_login_delegate) {
   weak_java_auto_login_delegate_ = weak_java_auto_login_delegate;
-  JNIEnv* env = AttachCurrentThread();
+  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() && !jaccount.is_null() && !jargs.is_null());
+  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_ = ConvertJavaStringToUTF8(
-      Java_AutoLoginDelegate_initializeAccount(env,
-                                               delegate.obj(),
-                                               reinterpret_cast<jint>(this),
-                                               jrealm.obj(),
-                                               jaccount.obj(),
-                                               jargs.obj()));
+  user_ = ConvertJavaStringToUTF8(Java_AutoLoginDelegate_initializeAccount(
+      env, delegate.obj(), reinterpret_cast<jint>(this), jrealm.obj(),
+      jaccount.obj(), jargs.obj()));
   return !user_.empty();
 }
 
@@ -57,13 +56,13 @@
 }
 
 bool AutoLoginInfoBarDelegateAndroid::Accept() {
-  JNIEnv* env = AttachCurrentThread();
+  JNIEnv* env = base::android::AttachCurrentThread();

[Miguel Garcia, 2013/09/25 23:23:48]

curious on why the namespace shortcut  is not ok for AttachCurrentThread but is
however ok for ConvertJavaStringToUTF8

[Peter Kasting, 2013/09/25 23:26:23]

Why does the unqualified ConvertJavaStringToUTF8() call above even compile? 
Shouldn't this require a namespace too?

I suspect, though, that you meant to ask about ConvertUTF8ToJavaString(). 
Basically, the infobar code tries to avoid using declarations unless they save
some lines.  Switching that call to be fully-qualified would end up adding a
couple more lines of verbosity overall.

   ScopedJavaLocalRef<jobject> delegate =
       weak_java_auto_login_delegate_.get(env);
   DCHECK(delegate.obj());
 
-  Java_AutoLoginDelegate_logIn(
-      env, delegate.obj(), reinterpret_cast<jint>(this));
+  Java_AutoLoginDelegate_logIn(env, delegate.obj(),
+                               reinterpret_cast<jint>(this));
 
   // Do not close the infobar on accept, it will be closed as part
   // of the log in callback.
@@ -71,12 +70,12 @@
 }
 
 bool AutoLoginInfoBarDelegateAndroid::Cancel() {
-  JNIEnv* env = AttachCurrentThread();
+  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<jint>(this));
+  Java_AutoLoginDelegate_cancelLogIn(env, delegate.obj(),
+                                     reinterpret_cast<jint>(this));
   return true;
 }
 
@@ -104,10 +103,8 @@
   DCHECK(delegate.obj());
   if (owner()) {
     SimpleAlertInfoBarDelegate::Create(
-        owner(),
-        IDR_INFOBAR_WARNING,
-        l10n_util::GetStringUTF16(IDS_AUTO_LOGIN_FAILED),
-        false);
+        owner(), IDR_INFOBAR_WARNING,
+        l10n_util::GetStringUTF16(IDS_AUTO_LOGIN_FAILED), false);
     owner()->RemoveInfoBar(this);
   }
 }
@@ -117,7 +114,6 @@
     owner()->RemoveInfoBar(this);
 }
 
-// Register Android JNI bindings.
 bool AutoLoginInfoBarDelegateAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }