Cleanup upstreamed Android infobar code.

chrome/browser/ui/android/infobars/auto_login_infobar_delegate_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/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/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::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();
 }
 
 string16 AutoLoginInfoBarDelegateAndroid::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_AUTOLOGIN_INFOBAR_MESSAGE,
                                     UTF8ToUTF16(user_));
 }
 
 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.
   return false;
 }
 
 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;
 }
 
 void AutoLoginInfoBarDelegateAndroid::LoginSuccess(JNIEnv* env,
                                                    jobject obj,
                                                    jstring result) {
   if (owner()) {
     content::WebContents* web_contents = owner()->web_contents();
     if (web_contents) {
       web_contents->Stop();
       web_contents->OpenURL(content::OpenURLParams(
           GURL(base::android::ConvertJavaStringToUTF8(env, result)),
           content::Referrer(),
           CURRENT_TAB,
           content::PAGE_TRANSITION_AUTO_BOOKMARK,
           false));
     }
     owner()->RemoveInfoBar(this);
   }
 }
 
 void AutoLoginInfoBarDelegateAndroid::LoginFailed(JNIEnv* env, jobject obj) {
   ScopedJavaLocalRef<jobject> delegate =
       weak_java_auto_login_delegate_.get(env);
   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);
   }
 }
 
 void AutoLoginInfoBarDelegateAndroid::LoginDismiss(JNIEnv* env, jobject obj) {
   if (owner())
     owner()->RemoveInfoBar(this);
 }
 
-// Register Android JNI bindings.
 bool AutoLoginInfoBarDelegateAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }