Remove unused network prediction related enums and a method.

This is a follow-up to https://crrev.com/c/2568665. Bug: 526773 Change-Id: I48beb93d9ca3366f519251c909da951215c6e0cf Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2587237 Reviewed-by: Natalie Chouinard <chouinard@chromium.org> Commit-Queue: Bence Béky <bnc@chromium.org> Cr-Commit-Position: refs/heads/master@{#838276}
Denger-Network · Dec 17, 2020 · 35ac37a · 35ac37a
1 parent 53e3903
commit 35ac37a
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 73 deletions.
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
@@ -1185,7 +1185,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/previews/PreviewsUma.java",
   "java/src/org/chromium/chrome/browser/printing/PrintShareActivity.java",
   "java/src/org/chromium/chrome/browser/printing/TabPrinter.java",
-  "java/src/org/chromium/chrome/browser/privacy/settings/BandwidthType.java",
   "java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java",
   "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
   "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/BandwidthType.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/BandwidthType.java
diff --git a/.../java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java b/.../java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java
@@ -147,15 +147,6 @@ public boolean isMetricsReportingManaged() {
         return PrivacyPreferencesManagerImplJni.get().isMetricsReportingManaged();
     }
 
-    /**
-     * @return Whether there is a user set value for kNetworkPredictionOptions.  This should only be
-     * used for preference migration. See http://crbug.com/334602
-     */
-    private boolean obsoleteNetworkPredictionOptionsHasUserSetting() {
-        return PrivacyPreferencesManagerImplJni.get()
-                .obsoleteNetworkPredictionOptionsHasUserSetting();
-    }
-
     @Override
     public boolean getNetworkPredictionEnabled() {
         return PrivacyPreferencesManagerImplJni.get().getNetworkPredictionEnabled();
@@ -175,7 +166,6 @@ public boolean isNetworkPredictionManaged() {
     public interface Natives {
         boolean canPrefetchAndPrerender();
         boolean getNetworkPredictionManaged();
-        boolean obsoleteNetworkPredictionOptionsHasUserSetting();
         boolean getNetworkPredictionEnabled();
         void setNetworkPredictionEnabled(boolean enabled);
         boolean isMetricsReportingEnabled();

diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
@@ -67,10 +67,3 @@ static void JNI_PrivacyPreferencesManagerImpl_SetNetworkPredictionEnabled(
       enabled ? chrome_browser_net::NETWORK_PREDICTION_WIFI_ONLY
               : chrome_browser_net::NETWORK_PREDICTION_NEVER);
 }
-
-static jboolean
-JNI_PrivacyPreferencesManagerImpl_ObsoleteNetworkPredictionOptionsHasUserSetting(
-    JNIEnv* env) {
-  return GetPrefService()->GetUserPrefValue(prefs::kNetworkPredictionOptions) !=
-         nullptr;
-}
diff --git a/...rences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/...rences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
@@ -560,9 +560,6 @@ public final class ChromePreferenceKeys {
 
     public static final String PRIVACY_METRICS_REPORTING = "metrics_reporting";
     public static final String PRIVACY_METRICS_IN_SAMPLE = "in_metrics_sample";
-    public static final String PRIVACY_BANDWIDTH_OLD = "prefetch_bandwidth";
-    public static final String PRIVACY_BANDWIDTH_NO_CELLULAR_OLD = "prefetch_bandwidth_no_cellular";
-    public static final String PRIVACY_ALLOW_PRERENDER_OLD = "allow_prefetch";
 
     public static final String PROFILES_BOOT_TIMESTAMP =
             "com.google.android.apps.chrome.ChromeMobileApplication.BOOT_TIMESTAMP";

diff --git a/...roid/java/src/org/chromium/chrome/browser/preferences/DeprecatedChromePreferenceKeys.java b/...roid/java/src/org/chromium/chrome/browser/preferences/DeprecatedChromePreferenceKeys.java
@@ -39,6 +39,7 @@ static List<String> getKeysForTesting() {
                 "PrefMigrationVersion",
                 "ServiceManagerFeatures",
                 "allow_low_end_device_ui",
+                "allow_prefetch",
                 "allow_starting_service_manager_only",
                 "bookmark_search_history",
                 "bottom_toolbar_enabled",
@@ -65,6 +66,8 @@ static List<String> getKeysForTesting() {
                 "ntp_button_variant",
                 "physical_web",
                 "physical_web_sharing",
+                "prefetch_bandwidth",
+                "prefetch_bandwidth_no_cellular",
                 "sole_integration_enabled",
                 "start_surface_single_pane_enabled",
                 "tab_persistent_store_task_runner_enabled",

diff --git a/...d/java/src/org/chromium/chrome/browser/preferences/GrandfatheredChromePreferenceKeys.java b/...d/java/src/org/chromium/chrome/browser/preferences/GrandfatheredChromePreferenceKeys.java
@@ -128,9 +128,6 @@ static List<String> getKeysInUse() {
                 ChromePreferenceKeys.PREFETCH_NOTIFICATION_ENABLED,
                 ChromePreferenceKeys.PREFETCH_NOTIFICATION_TIME,
                 ChromePreferenceKeys.PREFETCH_OFFLINE_COUNTER,
-                ChromePreferenceKeys.PRIVACY_ALLOW_PRERENDER_OLD,
-                ChromePreferenceKeys.PRIVACY_BANDWIDTH_NO_CELLULAR_OLD,
-                ChromePreferenceKeys.PRIVACY_BANDWIDTH_OLD,
                 ChromePreferenceKeys.PRIVACY_METRICS_IN_SAMPLE,
                 ChromePreferenceKeys.PRIVACY_METRICS_REPORTING,
                 ChromePreferenceKeys.PROFILES_BOOT_TIMESTAMP,