Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 456813002: Do not migrate NetworkPrediction preference on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Specify TODO timeframe in comment. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/browser_prefs.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 35472d8239fd2ec25ccff8659267681492c4a850..832d08367fc764e02d11f117e4c1df707467e980 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -528,11 +528,15 @@ void MigrateUserPrefs(Profile* profile) {
// Cleanup now-removed sync promo error message preference.
// TODO(fdoray): Remove this when it's safe to do so (crbug.com/268442).
prefs->ClearPref(kSyncPromoErrorMessage);
+ // Migrate kNetworkPredictionEnabled to kNetworkPredictionOptions when not on
+ // Android. On Android, platform-specific code performs preference migration.
+ // TODO(bnc): https://crbug.com/401970 Remove migration code one year after
+ // M38.
+ chrome_browser_net::MigrateNetworkPredictionUserPrefs(prefs);
#endif
PromoResourceService::MigrateUserPrefs(prefs);
translate::TranslatePrefs::MigrateUserPrefs(prefs, prefs::kAcceptLanguages);
- chrome_browser_net::MigrateNetworkPredictionUserPrefs(prefs);
#if defined(OS_MACOSX) && !defined(OS_IOS)
autofill::AutofillManager::MigrateUserPrefs(prefs);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698