Index: chrome/browser/predictors/resource_prefetch_predictor_android.cc |
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_android.cc b/chrome/browser/predictors/resource_prefetch_predictor_android.cc |
index 0d054315e7ee9043c94d9f8117074a3128cb23bd..b0b2f969707d20d25cfb5f13fc8d81adca518ba9 100644 |
--- a/chrome/browser/predictors/resource_prefetch_predictor_android.cc |
+++ b/chrome/browser/predictors/resource_prefetch_predictor_android.cc |
@@ -6,8 +6,10 @@ |
#include "base/android/jni_android.h" |
#include "base/android/jni_string.h" |
-#include "chrome/browser/predictors/resource_prefetch_predictor.h" |
-#include "chrome/browser/predictors/resource_prefetch_predictor_factory.h" |
+ |
+#include "chrome/browser/predictors/loading_predictor.h" |
+#include "chrome/browser/predictors/loading_predictor_factory.h" |
+ |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/profiles/profile_android.h" |
#include "jni/ResourcePrefetchPredictor_jni.h" |
@@ -18,13 +20,12 @@ using base::android::ScopedJavaLocalRef; |
namespace predictors { |
namespace { |
-ResourcePrefetchPredictor* ResourcePrefetchPredictorFromProfileAndroid( |
+LoadingPredictor* LoadingPredictorFromProfileAndroid( |
const JavaParamRef<jobject>& j_profile) { |
Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile); |
if (!profile) |
return nullptr; |
- return ResourcePrefetchPredictorFactory::GetInstance()->GetForProfile( |
- profile); |
+ return LoadingPredictorFactory::GetInstance()->GetForProfile(profile); |
} |
} // namespace |
@@ -32,10 +33,10 @@ ResourcePrefetchPredictor* ResourcePrefetchPredictorFromProfileAndroid( |
static jboolean StartInitialization(JNIEnv* env, |
const JavaParamRef<jclass>& clazz, |
const JavaParamRef<jobject>& j_profile) { |
- auto* predictor = ResourcePrefetchPredictorFromProfileAndroid(j_profile); |
- if (!predictor) |
+ auto* loading_predictor = LoadingPredictorFromProfileAndroid(j_profile); |
+ if (!loading_predictor) |
return false; |
- predictor->StartInitialization(); |
+ loading_predictor->resource_prefetch_predictor()->StartInitialization(); |
return true; |
} |
@@ -43,11 +44,11 @@ static jboolean StartPrefetching(JNIEnv* env, |
const JavaParamRef<jclass>& clazz, |
const JavaParamRef<jobject>& j_profile, |
const JavaParamRef<jstring>& j_url) { |
- auto* predictor = ResourcePrefetchPredictorFromProfileAndroid(j_profile); |
- if (!predictor) |
+ auto* loading_predictor = LoadingPredictorFromProfileAndroid(j_profile); |
+ if (!loading_predictor) |
return false; |
GURL url = GURL(base::android::ConvertJavaStringToUTF16(env, j_url)); |
- predictor->StartPrefetching(url, PrefetchOrigin::EXTERNAL); |
+ loading_predictor->PrepareForPageLoad(url, HintOrigin::EXTERNAL); |
return true; |
} |
@@ -56,11 +57,11 @@ static jboolean StopPrefetching(JNIEnv* env, |
const JavaParamRef<jclass>& clazz, |
const JavaParamRef<jobject>& j_profile, |
const JavaParamRef<jstring>& j_url) { |
- auto* predictor = ResourcePrefetchPredictorFromProfileAndroid(j_profile); |
- if (!predictor) |
+ auto* loading_predictor = LoadingPredictorFromProfileAndroid(j_profile); |
+ if (!loading_predictor) |
return false; |
GURL url = GURL(base::android::ConvertJavaStringToUTF16(env, j_url)); |
- predictor->StopPrefetching(url); |
+ loading_predictor->CancelPageLoadHint(url); |
return true; |
} |