Enable forced prerenders on wifi

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"
-#include "net/base/network_change_notifier.h"
 
 using base::android::ConvertJavaStringToUTF16;
 using base::android::JavaParamRef;
 
 namespace prerender {
 
 namespace {
 
 bool CheckAndConvertParams(JNIEnv* env,
                            const JavaParamRef<jobject>& jprofile,
@@ skipping 14 matching lines @@
   if (!*prerender_manager)
     return false;
 
   *web_contents = content::WebContents::FromJavaWebContents(jweb_contents);
   return true;
 }
 
 }  // namespace
 
 base::android::ScopedJavaLocalRef<jobject>
-    ExternalPrerenderHandlerAndroid::AddPrerender(
+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 top,
     jint left,
     jint bottom,
     jint right,
-    jboolean prerender_on_cellular) {
+    jboolean forced_prerender) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
 
   GURL url = GURL(ConvertJavaStringToUTF16(env, jurl));
   if (!url.is_valid())
     return nullptr;
   content::Referrer referrer;
   if (!jreferrer.is_null()) {
     GURL referrer_url(ConvertJavaStringToUTF16(env, jreferrer));
     if (referrer_url.is_valid()) {
       referrer =
           content::Referrer(referrer_url, blink::WebReferrerPolicyDefault);
     }
   }
 
   PrerenderManager* prerender_manager =
       PrerenderManagerFactory::GetForBrowserContext(profile);
   if (!prerender_manager)
     return nullptr;
 
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(jweb_contents);
   if (prerender_handle_)
     prerender_handle_->OnNavigateAway();
 
-  if (prerender_on_cellular && net::NetworkChangeNotifier::IsConnectionCellular(
-                   net::NetworkChangeNotifier::GetConnectionType())) {
+  if (forced_prerender) {
     prerender_handle_ =
-        prerender_manager->AddPrerenderOnCellularFromExternalRequest(
+        prerender_manager->AddForcedPrerenderFromExternalRequest(
             url, referrer,
             web_contents->GetController().GetDefaultSessionStorageNamespace(),
             gfx::Rect(left, top, right - left, bottom - top));
   } else {
     prerender_handle_ = prerender_manager->AddPrerenderFromExternalRequest(
         url, referrer,
         web_contents->GetController().GetDefaultSessionStorageNamespace(),
         gfx::Rect(left, top, right - left, bottom - top));
   }
 
@@ skipping 56 matching lines @@
       new ExternalPrerenderHandlerAndroid();
   return reinterpret_cast<intptr_t>(external_handler);
 }
 
 bool ExternalPrerenderHandlerAndroid::RegisterExternalPrerenderHandlerAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace prerender