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

chrome/browser/android/preferences/pref_service_bridge.cc

 // 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.
 
 #include "chrome/browser/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
@@ skipping 212 matching lines @@
 
 static jboolean GetSearchSuggestEnabled(JNIEnv* env, jobject obj) {
   return GetPrefService()->GetBoolean(prefs::kSearchSuggestEnabled);
 }
 
 static jboolean GetSearchSuggestManaged(JNIEnv* env, jobject obj) {
   return GetPrefService()->IsManagedPreference(prefs::kSearchSuggestEnabled);
 }
 
 static jboolean GetProtectedMediaIdentifierEnabled(JNIEnv* env, jobject obj) {
-  // Migrate Settings from Preferences to the Host Content Settings Map.
-  // TODO (knn): Remove this once users have migrated.
-  PrefService* prefs = GetPrefService();
-  if (!prefs->GetBoolean(prefs::kProtectedMediaIdentifierEnabled)) {
-    prefs->SetBoolean(prefs::kProtectedMediaIdentifierEnabled, true);
-    SetProtectedMediaIdentifierEnabled(env, obj, false);
-  }
   return GetBooleanForContentSetting(
       CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER);
 }
 
 static jboolean GetPushNotificationsEnabled(JNIEnv* env, jobject obj) {
   return GetBooleanForContentSetting(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 static jboolean GetAllowLocationEnabled(JNIEnv* env, jobject obj) {
-  // Migrate Settings from Preferences to the Host Content Settings Map.
-  // TODO (knn): Remove this once users have migrated.
-  PrefService* prefs = GetPrefService();
-  // Non-user-modifiable preference levels should have been migrated already.
-  DCHECK(prefs->IsUserModifiablePreference(prefs::kGeolocationEnabled));
-  if (!prefs->GetBoolean(prefs::kGeolocationEnabled)) {
-    prefs->SetBoolean(prefs::kGeolocationEnabled, true);
-    SetAllowLocationEnabled(env, obj, false);
-  }
   return GetBooleanForContentSetting(CONTENT_SETTINGS_TYPE_GEOLOCATION);
 }
 
 static jboolean GetAllowLocationUserModifiable(JNIEnv* env, jobject obj) {
   return IsContentSettingUserModifiable(CONTENT_SETTINGS_TYPE_GEOLOCATION);
 }
 
 static jboolean GetAllowLocationManagedByCustodian(JNIEnv* env, jobject obj) {
   return IsContentSettingManagedByCustodian(CONTENT_SETTINGS_TYPE_GEOLOCATION);
 }
@@ skipping 238 matching lines @@
   if (!javascript_pref->HasUserSetting())
     return;
 
   bool javascript_enabled = false;
   bool retval = javascript_pref->GetValue()->GetAsBoolean(&javascript_enabled);
   DCHECK(retval);
   SetJavaScriptEnabled(env, obj, javascript_enabled);
   GetPrefService()->ClearPref(prefs::kWebKitJavascriptEnabled);
 }
 
+static void MigrateLocationPreference(JNIEnv* env, jobject obj) {
+  const PrefService::Preference* pref =
+      GetPrefService()->FindPreference(prefs::kGeolocationEnabled);
+  if (!pref || !pref->HasUserSetting())
+    return;
+  bool location_enabled = false;
+  bool retval = pref->GetValue()->GetAsBoolean(&location_enabled);
+  DCHECK(retval);
+  // Do a restrictive migration. GetAllowLocationEnabled could be
+  // non-usermodifiable and we don't want to migrate that.
+  if (!location_enabled)
+    SetAllowLocationEnabled(env, obj, false);
+  GetPrefService()->ClearPref(prefs::kGeolocationEnabled);
+}
+
+static void MigrateProtectedMediaPreference(JNIEnv* env, jobject obj) {
+  const PrefService::Preference* pref =
+      GetPrefService()->FindPreference(prefs::kProtectedMediaIdentifierEnabled);
+  if (!pref || !pref->HasUserSetting())
+    return;
+  bool pmi_enabled = false;
+  bool retval = pref->GetValue()->GetAsBoolean(&pmi_enabled);
+  DCHECK(retval);
+  // Do a restrictive migration if values disagree.
+  pmi_enabled &= GetProtectedMediaIdentifierEnabled(env, obj);

[newt (away), 2015/04/03 01:12:40]

I'd use the same form here that you use in MigrateLocationPreference(), i.e.

    if (!pmi_enabled)
      SetProtectedMediaIdentifierEnabled(env, obj, false);

+  SetProtectedMediaIdentifierEnabled(env, obj, pmi_enabled);
+  GetPrefService()->ClearPref(prefs::kProtectedMediaIdentifierEnabled);
+}
+
 static void SetPasswordEchoEnabled(JNIEnv* env,
                                    jobject obj,
                                    jboolean passwordEchoEnabled) {
   GetPrefService()->SetBoolean(prefs::kWebKitPasswordEchoEnabled,
                                passwordEchoEnabled);
 }
 
 static jboolean GetAllowPopupsEnabled(JNIEnv* env, jobject obj) {
   return GetBooleanForContentSetting(CONTENT_SETTINGS_TYPE_POPUPS);
 }
@@ skipping 270 matching lines @@
                                                                jobject obj) {
   return ConvertUTF8ToJavaString(
       env,
       GetPrefService()->GetString(
           prefs::kSupervisedUserSecondCustodianProfileImageURL)).Release();
 }
 
 bool RegisterPrefServiceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }