Tweaks to the precache triggering code.

chrome/browser/android/precache/precache_launcher.cc

 // Copyright 2014 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/android/precache/precache_launcher.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
@@ skipping 47 matching lines @@
 }
 
 void PrecacheLauncher::Start(JNIEnv* env, jobject obj) {
   // TODO(bengr): Add integration tests for the whole feature.
   Profile* profile = GetProfile();
 
   PrecacheManager* precache_manager = GetPrecacheManager(profile);
   history::HistoryService* hs = HistoryServiceFactory::GetForProfile(
       profile, ServiceAccessType::IMPLICIT_ACCESS);
 
-  if (precache_manager == nullptr || hs == nullptr ||
-      !precache_manager->IsPrecachingAllowed()) {
-    Java_PrecacheLauncher_onPrecacheCompletedCallback(
-        env, weak_java_precache_launcher_.get(env).obj());
+  if (precache_manager == nullptr || hs == nullptr) {
+    OnPrecacheCompleted();
     return;
   }
 
   precache_manager->StartPrecaching(
       base::Bind(&PrecacheLauncher::OnPrecacheCompleted,
                  weak_factory_.GetWeakPtr()),
       *hs);
 }
 
 void PrecacheLauncher::Cancel(JNIEnv* env, jobject obj) {
   Profile* profile = GetProfile();
   PrecacheManager* precache_manager = GetPrecacheManager(profile);
 
   precache_manager->CancelPrecaching();
 }
 
 void PrecacheLauncher::OnPrecacheCompleted() {
   JNIEnv* env = AttachCurrentThread();
   Java_PrecacheLauncher_onPrecacheCompletedCallback(
       env, weak_java_precache_launcher_.get(env).obj());
 }
 
 static jlong Init(JNIEnv* env, jobject obj) {
   return reinterpret_cast<intptr_t>(new PrecacheLauncher(env, obj));
 }
 
-static jboolean IsPrecachingEnabled(JNIEnv* env, jclass clazz) {
-  return PrecacheManager::IsPrecachingEnabled();
+// Must be run on the UI thread.
+static jboolean ShouldRun(JNIEnv* env, jobject obj) {
+  Profile* profile = GetProfile();
+  PrecacheManager* precache_manager = GetPrecacheManager(profile);
+  return precache_manager && precache_manager->ShouldRun();
 }
 
 bool RegisterPrecacheLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }