Fix IsPrecachingAllowed() to check Sync instead of Data Saver.

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"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/history_service_factory.h"
+#include "chrome/browser/precache/precache_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "components/keyed_service/core/service_access_type.h"
 #include "components/precache/content/precache_manager.h"
-#include "components/precache/content/precache_manager_factory.h"
 #include "jni/PrecacheLauncher_jni.h"
 
 using base::android::AttachCurrentThread;
 using precache::PrecacheManager;
 
 namespace history {
 class HistoryService;
 }
 
 namespace {
 
 // Get the profile that should be used for precaching.
 Profile* GetProfile() {
   Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile()
       ->GetOriginalProfile();
   DCHECK(profile);
   DCHECK(g_browser_process->profile_manager()->IsValidProfile(profile));
   return profile;
 }
 
 // Get the PrecacheManager for the given |profile|.
 PrecacheManager* GetPrecacheManager(Profile* profile) {
   PrecacheManager* precache_manager =
       precache::PrecacheManagerFactory::GetForBrowserContext(profile);
   DCHECK(precache_manager);

[bengr, 2015/06/23 22:16:19]

I'm 99.999% sure this will never be called from incognito, but if it is,
precache_manager will be null and the DCHECK won't be in a release.

[twifkak, 2015/06/23 23:54:51]

Okay, added a null check at line 68.

   return precache_manager;
 }
 
-bool IsSyncTabsEnabled(Profile* profile) {
-  ProfileSyncService* sync = ProfileSyncServiceFactory::GetForProfile(profile);
-  return sync->CanSyncStart() &&
-         sync->GetPreferredDataTypes().Has(syncer::PROXY_TABS);
-}
-
 }  // namespace
 
 PrecacheLauncher::PrecacheLauncher(JNIEnv* env, jobject obj)
     : weak_java_precache_launcher_(env, obj), weak_factory_(this) {}
 
 PrecacheLauncher::~PrecacheLauncher() {}
 
 void PrecacheLauncher::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 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 (hs == nullptr || !IsSyncTabsEnabled(profile)) {
+  if (hs == nullptr || !precache_manager->IsPrecachingAllowed()) {
     Java_PrecacheLauncher_onPrecacheCompletedCallback(
         env, weak_java_precache_launcher_.get(env).obj());
     return;
   }
 
   precache_manager->StartPrecaching(
       base::Bind(&PrecacheLauncher::OnPrecacheCompleted,
                  weak_factory_.GetWeakPtr()),
       *hs);
 }
@@ skipping 15 matching lines @@
   return reinterpret_cast<intptr_t>(new PrecacheLauncher(env, obj));
 }
 
 static jboolean IsPrecachingEnabled(JNIEnv* env, jclass clazz) {
   return PrecacheManager::IsPrecachingEnabled();
 }
 
 bool RegisterPrecacheLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }