Migrate Location and Protected Media Identifier Settings at startup instead of the getter.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.preferences;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
@@ skipping 21 matching lines @@
     public static final String EXCEPTION_SETTING_BLOCK = "block";
     public static final String EXCEPTION_SETTING_DEFAULT = "default";
 
     // These values must match the native enum values in
     // SupervisedUserURLFilter::FilteringBehavior
     public static final int SUPERVISED_USER_FILTERING_ALLOW = 0;
     public static final int SUPERVISED_USER_FILTERING_WARN = 1;
     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;
 
     // Object to notify when "clear browsing data" completes.
     private OnClearBrowsingDataListener mClearBrowsingDataListener;
     private static final String LOG_TAG = "PrefServiceBridge";
 
     // Constants related to the Contextual Search preference.
     private static final String CONTEXTUAL_SEARCH_DISABLED = "false";
     private static final String CONTEXTUAL_SEARCH_ENABLED = "true";
@@ skipping 81 matching lines @@
         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 <= 0) {
             nativeMigrateJavascriptPreference();
         }
+        if (currentVersion <= 1) {
+            nativeMigrateLocationPreference();
+            nativeMigrateProtectedMediaPreference();
+        }
         preferences.edit().putInt(MIGRATION_PREF_KEY, MIGRATION_CURRENT_VERSION).commit();
     }
 
     /**
      * Returns the path to the user's profile directory via a callback. The callback may be
      * called synchronously or asynchronously.
      */
     public void getProfilePath(ProfilePathCallback callback) {
         if (!TextUtils.isEmpty(sProfilePath)) {
             callback.onGotProfilePath(sProfilePath);
@@ skipping 676 matching lines @@
     private native boolean nativeGetIncognitoModeEnabled();
     private native boolean nativeGetIncognitoModeManaged();
     private native boolean nativeGetPrintingEnabled();
     private native boolean nativeGetPrintingManaged();
     private native boolean nativeGetForceSafeSearch();
     private native void nativeSetTranslateEnabled(boolean enabled);
     private native void nativeResetTranslateDefaults();
     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,
             boolean cookiesAndSiteData, boolean passwords, boolean formData);
     private native boolean nativeCanDeleteBrowsingHistory();
     private native void nativeSetAllowCookiesEnabled(boolean allow);
     private native void nativeSetBlockThirdPartyCookiesEnabled(boolean enabled);
     private native void nativeSetDoNotTrackEnabled(boolean enabled);
     private native void nativeSetFullscreenAllowed(boolean allowed);
     private native void nativeSetRememberPasswordsEnabled(boolean allow);
@@ skipping 34 matching lines @@
     private native void nativeResetAcceptLanguages(String defaultLocale);
     private native String nativeGetSyncLastAccountName();
     private native String nativeGetSupervisedUserCustodianName();
     private native String nativeGetSupervisedUserCustodianEmail();
     private native String nativeGetSupervisedUserCustodianProfileImageURL();
     private native int nativeGetDefaultSupervisedUserFilteringBehavior();
     private native String nativeGetSupervisedUserSecondCustodianName();
     private native String nativeGetSupervisedUserSecondCustodianEmail();
     private native String nativeGetSupervisedUserSecondCustodianProfileImageURL();
 }