diff options
| author | bnc@chromium.org <bnc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 15:16:11 +0000 |
|---|---|---|
| committer | bnc@chromium.org <bnc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-11 15:17:55 +0000 |
| commit | a96a24ba956a7522c8b81961bae6e5cdb52e3c4c (patch) | |
| tree | 8ea48141a516ccc57d6711f78189157cb55fd31e /chrome/browser/prefs/browser_prefs.cc | |
| parent | 1e7f22e51b9ea7e512515849157a7b3fa6514934 (diff) | |
| download | chromium_src-a96a24ba956a7522c8b81961bae6e5cdb52e3c4c.zip chromium_src-a96a24ba956a7522c8b81961bae6e5cdb52e3c4c.tar.gz chromium_src-a96a24ba956a7522c8b81961bae6e5cdb52e3c4c.tar.bz2 | |
Do not migrate NetworkPrediction preference on Android.
Do not call chrome_browser_net::MigrateNetworkPredictionUserPrefs() on Android,
because preference migration from kNetworkPredictionEnabled to
kNetworkPredictionOptions is carried out by some platform-specific code on
Android.
BUG=334602
Review URL: https://codereview.chromium.org/456813002
Cr-Commit-Position: refs/heads/master@{#288714}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/browser_prefs.cc')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 3ab88f7..525dac2 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -530,11 +530,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); |