Pass method parameters as JavaParamRef in android_webview.

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 90 matching lines @@
   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);
   // 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, jobject obj,
-                                             jboolean proceed, jint id) {
+void AwContentsClientBridge::ProceedSslError(JNIEnv* env,

[Torne, 2015/12/03 14:56:30]

manual change: converted this file directly to JavaRef, as with header file.
This required a few manual changes to use .is_null() and .obj() in appropriate
places.

+                                             const JavaRef<jobject>& obj,
+                                             jboolean proceed,
+                                             jint id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   CertErrorCallback* callback = pending_cert_error_callbacks_.Lookup(id);
   if (!callback || callback->is_null()) {
     LOG(WARNING) << "Ignoring unexpected ssl error proceed callback";
     return;
   }
   callback->Run(proceed);
   pending_cert_error_callbacks_.Remove(id);
 }
 
@@ skipping 66 matching lines @@
       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,
-    jobject obj,
+    const JavaRef<jobject>& obj,
     int request_id,
-    jobjectArray encoded_chain_ref,
-    jobject private_key_ref) {
+    const JavaRef<jobjectArray>& encoded_chain_ref,
+    const JavaRef<jobject>& private_key_ref) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   content::ClientCertificateDelegate* delegate =
       pending_client_cert_request_delegates_.Lookup(request_id);
   DCHECK(delegate);
 
-  if (encoded_chain_ref == NULL || private_key_ref == NULL) {
+  if (encoded_chain_ref.is_null() || private_key_ref.is_null()) {
     LOG(ERROR) << "No client certificate selected";
     pending_client_cert_request_delegates_.Remove(request_id);
     delegate->ContinueWithCertificate(nullptr);
     delete delegate;
     return;
   }
 
   // Make sure callback is run on error.
   base::ScopedClosureRunner guard(base::Bind(
       &AwContentsClientBridge::HandleErrorInClientCertificateResponse,
       base::Unretained(this),
       request_id));
 
   // Convert the encoded chain to a vector of strings.
   std::vector<std::string> encoded_chain_strings;
-  if (encoded_chain_ref) {
+  if (!encoded_chain_ref.is_null()) {
     base::android::JavaArrayOfByteArrayToStringVector(
-        env, encoded_chain_ref, &encoded_chain_strings);
+        env, encoded_chain_ref.obj(), &encoded_chain_strings);
   }
 
   std::vector<base::StringPiece> encoded_chain;
   for (size_t i = 0; i < encoded_chain_strings.size(); ++i)
     encoded_chain.push_back(encoded_chain_strings[i]);
 
   // Create the X509Certificate object from the encoded chain.
   scoped_refptr<net::X509Certificate> client_cert(
       net::X509Certificate::CreateFromDERCertChain(encoded_chain));
   if (!client_cert.get()) {
     LOG(ERROR) << "Could not decode client certificate chain";
     return;
   }
 
   // Create an EVP_PKEY wrapper for the private key JNI reference.
   crypto::ScopedEVP_PKEY private_key(
-      net::android::GetOpenSSLPrivateKeyWrapper(private_key_ref));
+      net::android::GetOpenSSLPrivateKeyWrapper(private_key_ref.obj()));
   if (!private_key.get()) {
     LOG(ERROR) << "Could not create OpenSSL wrapper for private key";
     return;
   }
 
   // Release the guard and |pending_client_cert_request_delegates_| references
   // to |delegate|.
   pending_client_cert_request_delegates_.Remove(request_id);
   ignore_result(guard.Release());
 
@@ skipping 79 matching lines @@
       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);
 }
 
 void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env,
-                                             jobject,
+                                             const JavaRef<jobject>&,
                                              int id,
-                                             jstring prompt) {
+                                             const JavaRef<jstring>& prompt) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::JavaScriptDialogManager::DialogClosedCallback* callback =
       pending_js_dialog_callbacks_.Lookup(id);
   if (!callback) {
     LOG(WARNING) << "Unexpected JS dialog confirm. " << id;
     return;
   }
   base::string16 prompt_text;
-  if (prompt) {
+  if (!prompt.is_null()) {
     prompt_text = ConvertJavaStringToUTF16(env, prompt);
   }
   callback->Run(true, prompt_text);
   pending_js_dialog_callbacks_.Remove(id);
 }
 
-void AwContentsClientBridge::CancelJsResult(JNIEnv*, jobject, int id) {
+void AwContentsClientBridge::CancelJsResult(JNIEnv*,
+                                            const JavaRef<jobject>&,
+                                            int id) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::JavaScriptDialogManager::DialogClosedCallback* callback =
       pending_js_dialog_callbacks_.Lookup(id);
   if (!callback) {
     LOG(WARNING) << "Unexpected JS dialog cancel. " << id;
     return;
   }
   callback->Run(false, base::string16());
   pending_js_dialog_callbacks_.Remove(id);
 }
 
 // Use to cleanup if there is an error in client certificate response.
 void AwContentsClientBridge::HandleErrorInClientCertificateResponse(
     int request_id) {
   content::ClientCertificateDelegate* delegate =
       pending_client_cert_request_delegates_.Lookup(request_id);
   pending_client_cert_request_delegates_.Remove(request_id);
 
   delete delegate;
 }
 
 bool RegisterAwContentsClientBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview