diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-02 18:46:16 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-02 18:46:16 +0000 |
| commit | f87919d70dd8ec6cacf8de22ad670466fc035574 (patch) | |
| tree | e9697299edad96c759ff87332dabb47c6defbfaa /chrome/browser/net | |
| parent | 2cbcdca119f009bdf15608eebd9d3322d08e0861 (diff) | |
| download | chromium_src-f87919d70dd8ec6cacf8de22ad670466fc035574.zip chromium_src-f87919d70dd8ec6cacf8de22ad670466fc035574.tar.gz chromium_src-f87919d70dd8ec6cacf8de22ad670466fc035574.tar.bz2 | |
Remove user-related data from local_state and add to user_preferences, in preparation for multi-profile.
devtools
kDevToolsSplitLocation
browser
kBrowserWindowPlacement
Also add a method to browser_prefs to delete obsolete preferences from local state, and fix all related tests.
BUG=66717
TEST=all browser, interactive, and ui tests work properly
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=72153
Review URL: http://codereview.chromium.org/5915006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73481 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net')
| -rw-r--r-- | chrome/browser/net/predictor_api.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/net/predictor_api.cc b/chrome/browser/net/predictor_api.cc index e16e8e9..52a1497 100644 --- a/chrome/browser/net/predictor_api.cc +++ b/chrome/browser/net/predictor_api.cc @@ -20,6 +20,7 @@ #include "chrome/browser/net/preconnect.h" #include "chrome/browser/net/referrer.h" #include "chrome/browser/net/url_info.h" +#include "chrome/browser/prefs/browser_prefs.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profiles/profile.h" @@ -394,16 +395,15 @@ static void InitNetworkPredictor(TimeDelta max_dns_queue_delay, prefs::kDnsPrefetchingHostReferralList)->DeepCopy()); // Remove obsolete preferences from local state if necessary. - int dns_prefs_version = - user_prefs->GetInteger(prefs::kMultipleProfilePrefMigration); - if (dns_prefs_version < 1) { - // These prefs only need to be registered if they need to be cleared from - // local state. + int current_version = + local_state->GetInteger(prefs::kMultipleProfilePrefMigration); + if ((current_version & browser::DNS_PREFS) == 0) { local_state->RegisterListPref(prefs::kDnsStartupPrefetchList); local_state->RegisterListPref(prefs::kDnsHostReferralList); local_state->ClearPref(prefs::kDnsStartupPrefetchList); local_state->ClearPref(prefs::kDnsHostReferralList); - user_prefs->SetInteger(prefs::kMultipleProfilePrefMigration, 1); + local_state->SetInteger(prefs::kMultipleProfilePrefMigration, + current_version | browser::DNS_PREFS); } g_browser_process->io_thread()->InitNetworkPredictor( |