Remove PrefServiceBridge migration logic

Cleaning up JavascriptPreference migration logic that was introduce >4
years ago.

Bug: 1016957
Change-Id: I587e0d9722850b861bac8cc768476ae4e36ce93a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1895328Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712372}

chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

@@ -68,7 +68,6 @@ import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
 import org.chromium.chrome.browser.photo_picker.PhotoPickerDialog;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
-import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
 import org.chromium.chrome.browser.rlz.RevenueStats;
 import org.chromium.chrome.browser.searchwidget.SearchWidgetProvider;
@@ -226,8 +225,6 @@ public class ProcessInitializationHandler {
         AppBannerManager.setAppDetailsDelegate(AppHooks.get().createAppDetailsDelegate());
         ChromeLifetimeController.initialize();
 
-        PrefServiceBridge.getInstance().migratePreferences();
-
         if (ChromeFeatureList.isEnabled(ChromeFeatureList.NEW_PHOTO_PICKER)) {
             UiUtils.setPhotoPickerDelegate(new UiUtils.PhotoPickerDelegate() {
                 private PhotoPickerDialog mDialog;

chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java

@@ -297,6 +297,12 @@ public class ChromePreferenceManager {
      */
     public static final String OFFLINE_INDICATOR_V2_ENABLED_KEY = "offline_indicator_v2_enabled";
 
+    /**
+     * Previously used to migrate {@link PrefServiceBridge} preferences to current version.
+     */
+    @Deprecated
+    private static final String MIGRATION_PREF_KEY = "PrefMigrationVersion";
+
     private static class LazyHolder {
         static final ChromePreferenceManager INSTANCE = new ChromePreferenceManager();
     }

chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java

@@ -4,13 +4,9 @@
 
 package org.chromium.chrome.browser.preferences;
 
-import android.content.SharedPreferences;
-import android.util.Log;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import org.chromium.base.ContextUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
@@ -30,9 +26,6 @@ import java.util.List;
  * preferences.
  */
 public class PrefServiceBridge {
-    private static final String MIGRATION_PREF_KEY = "PrefMigrationVersion";
-    private static final int MIGRATION_CURRENT_VERSION = 4;
-
     /** The android permissions associated with requesting location. */
     private static final String[] LOCATION_PERMISSIONS = {
             android.Manifest.permission.ACCESS_FINE_LOCATION,
@@ -160,26 +153,6 @@ public class PrefServiceBridge {
         return PrefServiceBridgeJni.get().isManagedPreference(preference);
     }
 
-    /**
-     * Migrates (synchronously) the preferences to the most recent version.
-     */
-    public void migratePreferences() {
-        SharedPreferences preferences = ContextUtils.getAppSharedPreferences();
-        int currentVersion = preferences.getInt(MIGRATION_PREF_KEY, 0);
-        if (currentVersion == MIGRATION_CURRENT_VERSION) return;
-        if (currentVersion > MIGRATION_CURRENT_VERSION) {
-            Log.e(LOG_TAG, "Saved preferences version is newer than supported.  Attempting to "
-                    + "run an older version of Chrome without clearing data is unsupported and "
-                    + "the results may be unpredictable.");
-        }
-
-        if (currentVersion < 1) {
-            PrefServiceBridgeJni.get().migrateJavascriptPreference();
-        }
-        // Steps 2,3,4 intentionally skipped.
-        preferences.edit().putInt(MIGRATION_PREF_KEY, MIGRATION_CURRENT_VERSION).apply();
-    }
-
     /**
      * Returns whether a particular content setting type is enabled.
      * @param contentSettingsType The content setting type to check.
@@ -861,7 +834,6 @@ public class PrefServiceBridge {
         boolean getSensorsEnabled();
         boolean getSoundEnabled();
         void setTranslateEnabled(boolean enabled);
-        void migrateJavascriptPreference();
         void setAutomaticDownloadsEnabled(boolean enabled);
         void setAutoplayEnabled(boolean enabled);
         void setAllowCookiesEnabled(boolean enabled);

chrome/browser/android/preferences/pref_service_bridge.cc

@@ -585,23 +585,6 @@ static void JNI_PrefServiceBridge_SetTranslateEnabled(
   GetPrefService()->SetBoolean(prefs::kOfferTranslateEnabled, enabled);
 }
 
-static void JNI_PrefServiceBridge_MigrateJavascriptPreference(JNIEnv* env) {
-  const PrefService::Preference* javascript_pref =
-      GetPrefService()->FindPreference(prefs::kWebKitJavascriptEnabled);
-  DCHECK(javascript_pref);
-
-  if (!javascript_pref->HasUserSetting())
-    return;
-
-  bool javascript_enabled = false;
-  bool retval = javascript_pref->GetValue()->GetAsBoolean(&javascript_enabled);
-  DCHECK(retval);
-  JNI_PrefServiceBridge_SetContentSettingEnabled(
-      env, static_cast<int>(ContentSettingsType::JAVASCRIPT),
-      javascript_enabled);
-  GetPrefService()->ClearPref(prefs::kWebKitJavascriptEnabled);
-}
-
 static void JNI_PrefServiceBridge_SetPasswordEchoEnabled(
     JNIEnv* env,
     jboolean passwordEchoEnabled) {