From a96a24ba956a7522c8b81961bae6e5cdb52e3c4c Mon Sep 17 00:00:00 2001 From: "bnc@chromium.org" Date: Mon, 11 Aug 2014 15:16:11 +0000 Subject: 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 --- chrome/browser/prefs/browser_prefs.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'chrome/browser/prefs/browser_prefs.cc') 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); -- cgit v1.1