Update "Predict network actions" UI setting.

chrome/browser/net/prediction_options.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/net/prediction_options.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/common/pref_names.h"
@@ skipping 28 matching lines @@
 namespace chrome_browser_net {
 
 void RegisterPredictionOptionsProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterIntegerPref(
       prefs::kNetworkPredictionOptions,
       chrome_browser_net::NETWORK_PREDICTION_UNSET,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
+void MigrateNetworkPredictionUserPrefs(PrefService* pref_service) {
+  const PrefService::Preference* network_prediction_options =
+      pref_service->FindPreference(prefs::kNetworkPredictionOptions);
+  DCHECK(network_prediction_options);
+
+  // Nothing to do if the user or this migration code has already set the new
+  // preference.
+  if (network_prediction_options->HasUserSetting())

[Bernhard Bauer, 2014/08/07 08:32:17]

You could directly use pref_service->IsUserModifiablePreference(...).

[bartfab (slow), 2014/08/07 12:17:06]

HasUserSetting() and IsUserModifiablePreference() are not the same thing at all.
The former tells you whether there is a user-set value, even if that value may
be currently shadowed by policy. The latter tells you whether policy is
currently in charge, irrespective of whether there is a user-set value or not.

The current code is correct - if there is a user-set value already, do nothing.

[Bernhard Bauer, 2014/08/07 12:24:12]

Urr, I meant pref_service->GetUserPrefValue().

[Bence, 2014/08/07 13:50:01]

Done.

+    return;
+
+  const PrefService::Preference* network_prediction_enabled =
+      pref_service->FindPreference(prefs::kNetworkPredictionEnabled);
+  DCHECK(network_prediction_enabled);
+
+  // Nothing to do if the user has not set the old preference.
+  if (!network_prediction_enabled->HasUserSetting())
+    return;
+
+  bool value;

[battre, 2014/08/07 07:56:52]

please initialize.

[Bence, 2014/08/07 13:50:01]

Done.

+  if (network_prediction_enabled->GetUserValue()->GetAsBoolean(&value)) {
+    pref_service->SetInteger(
+        prefs::kNetworkPredictionOptions,
+        value ? chrome_browser_net::NETWORK_PREDICTION_WIFI_ONLY
+              : chrome_browser_net::NETWORK_PREDICTION_NEVER);
+  }
+}
+
 bool CanPredictNetworkActionsIO(ProfileIOData* profile_io_data) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   DCHECK(profile_io_data);
 
   return CanPredictNetworkActions(
       profile_io_data->network_prediction_options()->GetValue(),
       profile_io_data->network_prediction_enabled()->GetValue());
 }
 
 bool CanPredictNetworkActionsUI(PrefService* prefs) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   DCHECK(prefs);
   return CanPredictNetworkActions(
       prefs->GetInteger(prefs::kNetworkPredictionOptions),
       prefs->GetBoolean(prefs::kNetworkPredictionEnabled));
 }
 
 }  // namespace chrome_browser_net