Remove now-unnecessary .obj() in Java method calls.

android_webview/native/aw_contents_client_bridge.cc

 // Copyright (c) 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 "android_webview/native/aw_contents_client_bridge.h"
 
 #include "android_webview/common/devtools_instrumentation.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 47 matching lines @@
       env, obj, reinterpret_cast<intptr_t>(this));
 }
 
 AwContentsClientBridge::~AwContentsClientBridge() {
   JNIEnv* env = AttachCurrentThread();
 
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null()) {
     // Clear the weak reference from the java peer to the native object since
     // it is possible that java object lifetime can exceed the AwContens.
-    Java_AwContentsClientBridge_setNativeContentsClientBridge(env, obj.obj(),
-                                                              0);
+    Java_AwContentsClientBridge_setNativeContentsClientBridge(env, obj, 0);
   }
 
   for (IDMap<content::ClientCertificateDelegate>::iterator iter(
            &pending_client_cert_request_delegates_);
        !iter.IsAtEnd(); iter.Advance()) {
     delete iter.GetCurrentValue();
   }
 }
 
 void AwContentsClientBridge::AllowCertificateError(
@@ skipping 14 matching lines @@
   ScopedJavaLocalRef<jbyteArray> jcert = base::android::ToJavaByteArray(
       env, reinterpret_cast<const uint8_t*>(der_string.data()),
       der_string.length());
   ScopedJavaLocalRef<jstring> jurl(ConvertUTF8ToJavaString(
       env, request_url.spec()));
   // We need to add the callback before making the call to java side,
   // as it may do a synchronous callback prior to returning.
   int request_id = pending_cert_error_callbacks_.Add(
       new CertErrorCallback(callback));
   *cancel_request = !Java_AwContentsClientBridge_allowCertificateError(
-      env, obj.obj(), cert_error, jcert.obj(), jurl.obj(), request_id);
+      env, obj, cert_error, jcert, jurl, request_id);
   // if the request is cancelled, then cancel the stored callback
   if (*cancel_request) {
     pending_cert_error_callbacks_.Remove(request_id);
   }
 }
 
 void AwContentsClientBridge::ProceedSslError(JNIEnv* env,
                                              const JavaRef<jobject>& obj,
                                              jboolean proceed,
                                              jint id) {
@@ skipping 61 matching lines @@
     return;
   }
 
   // Build the |host_name| and |port| JNI parameters, as a String and
   // a jint.
   ScopedJavaLocalRef<jstring> host_name_ref =
       base::android::ConvertUTF8ToJavaString(
           env, cert_request_info->host_and_port.host());
 
   Java_AwContentsClientBridge_selectClientCertificate(
-      env,
-      obj.obj(),
-      request_id,
-      key_types_ref.obj(),
-      principals_ref.obj(),
-      host_name_ref.obj(),
+      env, obj, request_id, key_types_ref, principals_ref, host_name_ref,
       cert_request_info->host_and_port.port());
 
   // Release the guard.
   ignore_result(guard.Release());
 }
 
 // This method is inspired by OnSystemRequestCompletion() in
 // chrome/browser/ui/android/ssl_client_certificate_request.cc
 void AwContentsClientBridge::ProvideClientCertificateResponse(
     JNIEnv* env,
@@ skipping 82 matching lines @@
   int callback_id = pending_js_dialog_callbacks_.Add(
       new content::JavaScriptDialogManager::DialogClosedCallback(callback));
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, origin_url.spec()));
   ScopedJavaLocalRef<jstring> jmessage(
       ConvertUTF16ToJavaString(env, message_text));
 
   switch (message_type) {
     case content::JAVASCRIPT_MESSAGE_TYPE_ALERT: {
       devtools_instrumentation::ScopedEmbedderCallbackTask("onJsAlert");
-      Java_AwContentsClientBridge_handleJsAlert(
-          env, obj.obj(), jurl.obj(), jmessage.obj(), callback_id);
+      Java_AwContentsClientBridge_handleJsAlert(env, obj, jurl, jmessage,
+                                                callback_id);
       break;
     }
     case content::JAVASCRIPT_MESSAGE_TYPE_CONFIRM: {
       devtools_instrumentation::ScopedEmbedderCallbackTask("onJsConfirm");
-      Java_AwContentsClientBridge_handleJsConfirm(
-          env, obj.obj(), jurl.obj(), jmessage.obj(), callback_id);
+      Java_AwContentsClientBridge_handleJsConfirm(env, obj, jurl, jmessage,
+                                                  callback_id);
       break;
     }
     case content::JAVASCRIPT_MESSAGE_TYPE_PROMPT: {
       ScopedJavaLocalRef<jstring> jdefault_value(
           ConvertUTF16ToJavaString(env, default_prompt_text));
       devtools_instrumentation::ScopedEmbedderCallbackTask("onJsPrompt");
-      Java_AwContentsClientBridge_handleJsPrompt(env,
-                                                 obj.obj(),
-                                                 jurl.obj(),
-                                                 jmessage.obj(),
-                                                 jdefault_value.obj(),
-                                                 callback_id);
+      Java_AwContentsClientBridge_handleJsPrompt(env, obj, jurl, jmessage,
+                                                 jdefault_value, callback_id);
       break;
     }
     default:
        NOTREACHED();
   }
 }
 
 void AwContentsClientBridge::RunBeforeUnloadDialog(
     const GURL& origin_url,
     const content::JavaScriptDialogManager::DialogClosedCallback& callback) {
@@ skipping 10 matching lines @@
       l10n_util::GetStringUTF16(IDS_BEFOREUNLOAD_MESSAGEBOX_MESSAGE);
 
   int callback_id = pending_js_dialog_callbacks_.Add(
       new content::JavaScriptDialogManager::DialogClosedCallback(callback));
   ScopedJavaLocalRef<jstring> jurl(
       ConvertUTF8ToJavaString(env, origin_url.spec()));
   ScopedJavaLocalRef<jstring> jmessage(
       ConvertUTF16ToJavaString(env, message_text));
 
   devtools_instrumentation::ScopedEmbedderCallbackTask("onJsBeforeUnload");
-  Java_AwContentsClientBridge_handleJsBeforeUnload(
-      env, obj.obj(), jurl.obj(), jmessage.obj(), callback_id);
+  Java_AwContentsClientBridge_handleJsBeforeUnload(env, obj, jurl, jmessage,
+                                                   callback_id);
 }
 
 bool AwContentsClientBridge::ShouldOverrideUrlLoading(const base::string16& url,
                                                       bool has_user_gesture,
                                                       bool is_redirect,
                                                       bool is_main_frame) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return false;
   ScopedJavaLocalRef<jstring> jurl = ConvertUTF16ToJavaString(env, url);
   devtools_instrumentation::ScopedEmbedderCallbackTask(
       "shouldOverrideUrlLoading");
   return Java_AwContentsClientBridge_shouldOverrideUrlLoading(
-      env, obj.obj(), jurl.obj(), has_user_gesture, is_redirect, is_main_frame);
+      env, obj, jurl, has_user_gesture, is_redirect, is_main_frame);
 }
 
 void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env,
                                              const JavaRef<jobject>&,
                                              int id,
                                              const JavaRef<jstring>& prompt) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::JavaScriptDialogManager::DialogClosedCallback* callback =
       pending_js_dialog_callbacks_.Lookup(id);
   if (!callback) {
@@ skipping 30 matching lines @@
   pending_client_cert_request_delegates_.Remove(request_id);
 
   delete delegate;
 }
 
 bool RegisterAwContentsClientBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview