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 5758a105cd1f8fd9c842bb2a4b0a14e32d478ae7..c6a613d2baface1e08f2b083a5fd74392be2eef9 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 |
@@ -41,7 +41,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 = 2; |
+ private static final int MIGRATION_CURRENT_VERSION = 3; |
private static String sProfilePath; |
@@ -150,6 +150,10 @@ public final class PrefServiceBridge { |
if (currentVersion < 2) { |
addDefaultSearchEnginePermission(context); |
} |
+ if (currentVersion < 3) { |
+ nativeMigrateLocationPreference(); |
+ nativeMigrateProtectedMediaPreference(); |
+ } |
preferences.edit().putInt(MIGRATION_PREF_KEY, MIGRATION_CURRENT_VERSION).commit(); |
} |
@@ -889,6 +893,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, |