Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java |
index 97345a1729147bb1cf2c0f7812bd4673f5bf241c..d321b8f8aac87463bd19ed7c1f5b60868b4bb603 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java |
@@ -39,7 +39,7 @@ public final class PrefServiceBridge { |
public static final int SUPERVISED_USER_FILTERING_BLOCK = 2; |
private static final String MIGRATION_PREF_KEY = "PrefMigrationVersion"; |
- private static final int MIGRATION_CURRENT_VERSION = 1; |
+ private static final int MIGRATION_CURRENT_VERSION = 2; |
private static String sProfilePath; |
@@ -141,6 +141,10 @@ public final class PrefServiceBridge { |
if (currentVersion <= 0) { |
nativeMigrateJavascriptPreference(); |
} |
+ if (currentVersion <= 1) { |
+ nativeMigrateLocationPreference(); |
+ nativeMigrateProtectedMediaPreference(); |
+ } |
preferences.edit().putInt(MIGRATION_PREF_KEY, MIGRATION_CURRENT_VERSION).commit(); |
} |
@@ -837,6 +841,8 @@ public final class PrefServiceBridge { |
private native boolean nativeGetJavaScriptEnabled(); |
private native void nativeSetJavaScriptEnabled(boolean enabled); |
private native void nativeMigrateJavascriptPreference(); |
+ private native void nativeMigrateLocationPreference(); |
+ private native void nativeMigrateProtectedMediaPreference(); |
private native void nativeSetJavaScriptAllowed(String pattern, int setting); |
private native void nativeGetJavaScriptExceptions(List<JavaScriptExceptionInfo> list); |
private native void nativeClearBrowsingData(boolean history, boolean cache, |