android: Add a method to let Java know whether a prerender has finished loading.

chrome/browser/prerender/external_prerender_handler_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/prerender/external_prerender_handler_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prerender/prerender_handle.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "content/public/browser/web_contents.h"
 
 #include "jni/ExternalPrerenderHandler_jni.h"
 
 using base::android::ConvertJavaStringToUTF16;
 
 namespace prerender {
 
+namespace {
+
+static bool ConvertParams(JNIEnv* env,

[Yusuf, 2016/02/22 22:11:31]

maybe a better name for this as we don't convert all but sanity check some?

maybe just checkAndConvertPrerenderingParams?

[Benoit L, 2016/02/25 16:03:21]

Done.

+                          const JavaParamRef<jobject>& jprofile,
+                          const JavaParamRef<jstring>& jurl,
+                          const JavaParamRef<jobject>& jweb_contents,
+                          GURL* url,
+                          prerender::PrerenderManager** prerender_manager,
+                          content::WebContents** web_contents) {
+  if (jurl == NULL)
+    return false;
+  *url = GURL(ConvertJavaStringToUTF16(env, jurl));
+  if (!url->is_valid())
+    return false;
+
+  Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
+  *prerender_manager =
+      prerender::PrerenderManagerFactory::GetForProfile(profile);
+  if (!*prerender_manager)
+    return false;
+  *web_contents = content::WebContents::FromJavaWebContents(jweb_contents);
+  return true;
+}
+
+}  // namespace
+
 bool ExternalPrerenderHandlerAndroid::AddPrerender(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     const JavaParamRef<jobject>& jprofile,
     const JavaParamRef<jobject>& jweb_contents,
     const JavaParamRef<jstring>& jurl,
     const JavaParamRef<jstring>& jreferrer,
     jint width,
     jint height) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
@@ skipping 33 matching lines @@
     return;
   prerender_handle_->OnCancel();
   prerender_handle_.reset();
 }
 
 static jboolean HasPrerenderedUrl(JNIEnv* env,
                                   const JavaParamRef<jclass>& clazz,
                                   const JavaParamRef<jobject>& jprofile,
                                   const JavaParamRef<jstring>& jurl,
                                   const JavaParamRef<jobject>& jweb_contents) {
-  if (jurl == NULL)
+  GURL url;
+  prerender::PrerenderManager* prerender_manager;
+  content::WebContents* web_contents;
+  if (!ConvertParams(env, jprofile, jurl, jweb_contents, &url,
+                     &prerender_manager, &web_contents))
     return false;
-
-  Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
-  GURL url = GURL(ConvertJavaStringToUTF16(env, jurl));
-  if (!url.is_valid())
-    return false;
-  prerender::PrerenderManager* prerender_manager =
-          prerender::PrerenderManagerFactory::GetForProfile(profile);
-  if (!prerender_manager)
-    return false;
-  content::WebContents* web_contents =
-      content::WebContents::FromJavaWebContents(jweb_contents);
   return prerender_manager->HasPrerenderedUrl(url, web_contents);
 }
 
+static jboolean HasPrerenderedAndFinishedLoadingUrl(
+    JNIEnv* env,
+    const JavaParamRef<jclass>& clazz,
+    const JavaParamRef<jobject>& jprofile,
+    const JavaParamRef<jstring>& jurl,
+    const JavaParamRef<jobject>& jweb_contents) {
+  GURL url;
+  prerender::PrerenderManager* prerender_manager;
+  content::WebContents* web_contents;
+  if (!ConvertParams(env, jprofile, jurl, jweb_contents, &url,
+                     &prerender_manager, &web_contents))
+    return false;
+  return prerender_manager->HasPrerenderedAndFinishedLoadingUrl(url,
+                                                                web_contents);
+}
+
 ExternalPrerenderHandlerAndroid::ExternalPrerenderHandlerAndroid() {}
 
 ExternalPrerenderHandlerAndroid::~ExternalPrerenderHandlerAndroid() {}
 
 static jlong Init(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   ExternalPrerenderHandlerAndroid* external_handler =
       new ExternalPrerenderHandlerAndroid();
   return reinterpret_cast<intptr_t>(external_handler);
 }
 
 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 } // namespace prerender