| 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);
|
|
|