Pass method parameters as JavaParamRef in android_webview.

android_webview/native/aw_contents_client_bridge.cc

Index: android_webview/native/aw_contents_client_bridge.cc
diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index 9e570af6761308a0efd7d293ce26c41705c4701a..2dae8f5f1bef10a0d3c7b7e4a0b6e4f2703cd3ea 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -108,8 +108,10 @@ void AwContentsClientBridge::AllowCertificateError(
   }
 }
 
-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()) {
@@ -196,17 +198,17 @@ void AwContentsClientBridge::SelectClientCertificate(
 // 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);
@@ -222,9 +224,9 @@ void AwContentsClientBridge::ProvideClientCertificateResponse(
 
   // 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;
@@ -241,7 +243,7 @@ void AwContentsClientBridge::ProvideClientCertificateResponse(
 
   // 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;
@@ -341,9 +343,9 @@ void AwContentsClientBridge::RunBeforeUnloadDialog(
 }
 
 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);
@@ -352,14 +354,16 @@ void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env,
     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);