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

android_webview/native/aw_contents_io_thread_client_impl.cc

 // Copyright (c) 2012 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_io_thread_client_impl.h"
 
 #include <map>
 #include <memory>
 #include <utility>
 
@@ skipping 289 matching lines @@
 }
 
 AwContentsIoThreadClient::CacheMode
 AwContentsIoThreadClientImpl::GetCacheMode() const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return AwContentsIoThreadClient::LOAD_DEFAULT;
 
   JNIEnv* env = AttachCurrentThread();
   return static_cast<AwContentsIoThreadClient::CacheMode>(
-      Java_AwContentsIoThreadClient_getCacheMode(
-          env, java_object_.obj()));
+      Java_AwContentsIoThreadClient_getCacheMode(env, java_object_));
 }
 
 
 namespace {
 
 std::unique_ptr<AwWebResourceResponse> RunShouldInterceptRequest(
     WebResourceRequest web_request,
     JavaObjectWeakGlobalRef ref) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   JNIEnv* env = AttachCurrentThread();
@@ skipping 27 matching lines @@
 
 void AwContentsIoThreadClientImpl::ShouldInterceptRequestAsync(
     const net::URLRequest* request,
     const ShouldInterceptRequestResultCallback callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   base::Callback<std::unique_ptr<AwWebResourceResponse>()> get_response =
       base::Bind(&ReturnNull);
   JNIEnv* env = AttachCurrentThread();
   if (bg_thread_client_object_.is_null() && !java_object_.is_null()) {
     bg_thread_client_object_.Reset(
-        Java_AwContentsIoThreadClient_getBackgroundThreadClient(
-            env, java_object_.obj()));
+        Java_AwContentsIoThreadClient_getBackgroundThreadClient(env,
+                                                                java_object_));
   }
   if (!bg_thread_client_object_.is_null()) {
     get_response = base::Bind(
         &RunShouldInterceptRequest, WebResourceRequest(request),
         JavaObjectWeakGlobalRef(env, bg_thread_client_object_.obj()));
   }
   BrowserThread::PostTaskAndReplyWithResult(BrowserThread::FILE, FROM_HERE,
                                             get_response, callback);
 }
 
 bool AwContentsIoThreadClientImpl::ShouldBlockContentUrls() const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return false;
 
   JNIEnv* env = AttachCurrentThread();
-  return Java_AwContentsIoThreadClient_shouldBlockContentUrls(
-      env, java_object_.obj());
+  return Java_AwContentsIoThreadClient_shouldBlockContentUrls(env,
+                                                              java_object_);
 }
 
 bool AwContentsIoThreadClientImpl::ShouldBlockFileUrls() const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return false;
 
   JNIEnv* env = AttachCurrentThread();
-  return Java_AwContentsIoThreadClient_shouldBlockFileUrls(
-      env, java_object_.obj());
+  return Java_AwContentsIoThreadClient_shouldBlockFileUrls(env, java_object_);
 }
 
 bool AwContentsIoThreadClientImpl::ShouldAcceptThirdPartyCookies() const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return false;
 
   JNIEnv* env = AttachCurrentThread();
   return Java_AwContentsIoThreadClient_shouldAcceptThirdPartyCookies(
-      env, java_object_.obj());
+      env, java_object_);
 }
 
 bool AwContentsIoThreadClientImpl::ShouldBlockNetworkLoads() const {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return false;
 
   JNIEnv* env = AttachCurrentThread();
-  return Java_AwContentsIoThreadClient_shouldBlockNetworkLoads(
-      env, java_object_.obj());
+  return Java_AwContentsIoThreadClient_shouldBlockNetworkLoads(env,
+                                                               java_object_);
 }
 
 void AwContentsIoThreadClientImpl::NewDownload(
     const GURL& url,
     const string& user_agent,
     const string& content_disposition,
     const string& mime_type,
     int64_t content_length) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return;
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jstring_url =
       ConvertUTF8ToJavaString(env, url.spec());
   ScopedJavaLocalRef<jstring> jstring_user_agent =
       ConvertUTF8ToJavaString(env, user_agent);
   ScopedJavaLocalRef<jstring> jstring_content_disposition =
       ConvertUTF8ToJavaString(env, content_disposition);
   ScopedJavaLocalRef<jstring> jstring_mime_type =
       ConvertUTF8ToJavaString(env, mime_type);
 
   Java_AwContentsIoThreadClient_onDownloadStart(
-      env,
-      java_object_.obj(),
-      jstring_url.obj(),
-      jstring_user_agent.obj(),
-      jstring_content_disposition.obj(),
-      jstring_mime_type.obj(),
-      content_length);
+      env, java_object_, jstring_url, jstring_user_agent,
+      jstring_content_disposition, jstring_mime_type, content_length);
 }
 
 void AwContentsIoThreadClientImpl::NewLoginRequest(const string& realm,
                                                    const string& account,
                                                    const string& args) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return;
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jrealm = ConvertUTF8ToJavaString(env, realm);
   ScopedJavaLocalRef<jstring> jargs = ConvertUTF8ToJavaString(env, args);
 
   ScopedJavaLocalRef<jstring> jaccount;
   if (!account.empty())
     jaccount = ConvertUTF8ToJavaString(env, account);
 
-  Java_AwContentsIoThreadClient_newLoginRequest(
-      env, java_object_.obj(), jrealm.obj(), jaccount.obj(), jargs.obj());
+  Java_AwContentsIoThreadClient_newLoginRequest(env, java_object_, jrealm,
+                                                jaccount, jargs);
 }
 
 void AwContentsIoThreadClientImpl::OnReceivedError(
     const net::URLRequest* request) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return;
 
   JNIEnv* env = AttachCurrentThread();
   WebResourceRequest web_request(env, request);
 
   int error_code = request->status().error();
   ScopedJavaLocalRef<jstring> jstring_description = ConvertUTF8ToJavaString(
       env, net::ErrorToString(request->status().error()));
 
   Java_AwContentsIoThreadClient_onReceivedError(
-      env,
-      java_object_.obj(),
-      web_request.jstring_url.obj(),
-      web_request.is_main_frame,
-      web_request.has_user_gesture,
-      web_request.jstring_method.obj(),
-      web_request.jstringArray_header_names.obj(),
-      web_request.jstringArray_header_values.obj(),
-      error_code,
-      jstring_description.obj());
+      env, java_object_, web_request.jstring_url, web_request.is_main_frame,
+      web_request.has_user_gesture, web_request.jstring_method,
+      web_request.jstringArray_header_names,
+      web_request.jstringArray_header_values, error_code, jstring_description);
 }
 
 void AwContentsIoThreadClientImpl::OnReceivedHttpError(
     const net::URLRequest* request,
     const net::HttpResponseHeaders* response_headers) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return;
 
   JNIEnv* env = AttachCurrentThread();
@@ skipping 19 matching lines @@
       ConvertUTF8ToJavaString(env, encoding);
   int status_code = response_headers->response_code();
   ScopedJavaLocalRef<jstring> jstring_reason =
       ConvertUTF8ToJavaString(env, response_headers->GetStatusText());
   ScopedJavaLocalRef<jobjectArray> jstringArray_response_header_names =
       ToJavaArrayOfStrings(env, response_header_names);
   ScopedJavaLocalRef<jobjectArray> jstringArray_response_header_values =
       ToJavaArrayOfStrings(env, response_header_values);
 
   Java_AwContentsIoThreadClient_onReceivedHttpError(
-      env,
-      java_object_.obj(),
-      web_request.jstring_url.obj(),
-      web_request.is_main_frame,
-      web_request.has_user_gesture,
-      web_request.jstring_method.obj(),
-      web_request.jstringArray_header_names.obj(),
-      web_request.jstringArray_header_values.obj(),
-      jstring_mime_type.obj(),
-      jstring_encoding.obj(),
-      status_code,
-      jstring_reason.obj(),
-      jstringArray_response_header_names.obj(),
-      jstringArray_response_header_values.obj());
+      env, java_object_, web_request.jstring_url, web_request.is_main_frame,
+      web_request.has_user_gesture, web_request.jstring_method,
+      web_request.jstringArray_header_names,
+      web_request.jstringArray_header_values, jstring_mime_type,
+      jstring_encoding, status_code, jstring_reason,
+      jstringArray_response_header_names, jstringArray_response_header_values);
 }
 
 } // namespace android_webview