Remove user-related data from local_state and add to user_preferences, i...

chrome/browser/net/predictor_api.cc

Index: chrome/browser/net/predictor_api.cc
===================================================================
--- chrome/browser/net/predictor_api.cc	(revision 71191)
+++ chrome/browser/net/predictor_api.cc	(working copy)
@@ -393,19 +393,6 @@
       static_cast<ListValue*>(user_prefs->GetMutableList(
           prefs::kDnsPrefetchingHostReferralList)->DeepCopy());
 
-  // Remove obsolete preferences from local state if necessary.

[Ben Goodger (Google), 2011/01/13 22:21:23]

???

[Miranda Callahan, 2011/01/13 22:29:38]

I put this code in predictor_api when I added the patch to shift the Dns state
from local state to preferences; when I added the second patch to shift more
preferences out of local state it seemed bad to have two functions removing
obsolete prefs in different places -- so I moved this function to browser_prefs
and combined it with this latest patch in a single function to remove obsolete
preferences.

...which I then neglected to call.  Fixing.  Adding another test.

[Ben Goodger (Google), 2011/01/13 22:32:56]

OK... I am not familiar with this code enough to say where it should live.

-  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.
-    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);
-  }
-
   g_browser_process->io_thread()->InitNetworkPredictor(
       prefetching_enabled, max_dns_queue_delay, max_parallel_resolves, urls,
       referral_list, preconnect_enabled);