| Index: chrome/android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java b/chrome/android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java
|
| index 81a6537b65ec568caa12e034738a45e750c2723a..969ff1c6305af482610b9e394f929b49df351cef 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java
|
| @@ -10,7 +10,7 @@ import org.chromium.base.Log;
|
| import org.chromium.base.ThreadUtils;
|
| import org.chromium.base.VisibleForTesting;
|
| import org.chromium.base.annotations.CalledByNative;
|
| -import org.chromium.chrome.browser.preferences.PrefServiceBridge;
|
| +import org.chromium.chrome.browser.preferences.privacy.PrivacyPreferencesManager;
|
| import org.chromium.chrome.browser.sync.ProfileSyncService;
|
|
|
| import java.util.EnumSet;
|
| @@ -46,7 +46,7 @@ public abstract class PrecacheLauncher {
|
| */
|
| private boolean mCalled;
|
| private boolean mSyncInitialized;
|
| - private boolean mNetworkPredictionsAllowed;
|
| + private boolean mPrerenderEnabled;
|
| private boolean mShouldRun;
|
|
|
| /** Destroy the native PrecacheLauncher, releasing the memory that it was using. */
|
| @@ -115,15 +115,13 @@ public abstract class PrecacheLauncher {
|
| // thread.
|
| ThreadUtils.assertOnUiThread();
|
|
|
| - boolean networkPredictionEnabledPref =
|
| - PrefServiceBridge.getInstance().getNetworkPredictionEnabled();
|
| + boolean prerenderEnabled = PrivacyPreferencesManager.getInstance().shouldPrerender();
|
| boolean shouldRun = nativeShouldRun();
|
|
|
| - mNetworkPredictionsAllowed = networkPredictionEnabledPref;
|
| + mPrerenderEnabled = prerenderEnabled;
|
| mShouldRun = shouldRun;
|
|
|
| - PrecacheController.setIsPrecachingEnabled(
|
| - context, networkPredictionEnabledPref && shouldRun);
|
| + PrecacheController.setIsPrecachingEnabled(context, prerenderEnabled && shouldRun);
|
| Log.v(TAG, "updateEnabledSync complete");
|
| }
|
|
|
| @@ -181,7 +179,7 @@ public abstract class PrecacheLauncher {
|
| EnumSet<FailureReason> reasons = EnumSet.noneOf(FailureReason.class);
|
| if (!mCalled) reasons.add(FailureReason.UPDATE_PRECACHING_ENABLED_NEVER_CALLED);
|
| if (!mSyncInitialized) reasons.add(FailureReason.SYNC_NOT_INITIALIZED);
|
| - if (!mNetworkPredictionsAllowed) {
|
| + if (!mPrerenderEnabled) {
|
| reasons.add(FailureReason.PRERENDER_PRIVACY_PREFERENCE_NOT_ENABLED);
|
| }
|
| if (!mShouldRun) reasons.add(FailureReason.NATIVE_SHOULD_RUN_IS_FALSE);
|
|
|