Migrate HostReferralList and StartupDNSPrefetchList from local_state to user ...

chrome/browser/net/predictor_api.cc

Index: chrome/browser/net/predictor_api.cc
===================================================================
--- chrome/browser/net/predictor_api.cc	(revision 69337)
+++ chrome/browser/net/predictor_api.cc	(working copy)
@@ -133,12 +133,9 @@
     g_browser_process->io_thread()->ChangedToOnTheRecord();
 }
 
-void RegisterPrefs(PrefService* local_state) {
-  local_state->RegisterListPref(prefs::kDnsStartupPrefetchList);
-  local_state->RegisterListPref(prefs::kDnsHostReferralList);
-}
-
 void RegisterUserPrefs(PrefService* user_prefs) {
+  user_prefs->RegisterListPref(prefs::kDnsPrefetchingStartupList);
+  user_prefs->RegisterListPref(prefs::kDnsPrefetchingHostReferralList);
   user_prefs->RegisterBooleanPref(prefs::kDnsPrefetchingEnabled, true);
 }
 
@@ -393,9 +390,22 @@
       GetPredictedUrlListAtStartup(user_prefs, local_state);
 
   ListValue* referral_list =
-      static_cast<ListValue*>(
-          local_state->GetMutableList(prefs::kDnsHostReferralList)->DeepCopy());
+      static_cast<ListValue*>(user_prefs->GetMutableList(
+          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.
+    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);
@@ -462,9 +472,9 @@
       BrowserThread::IO,
       FROM_HERE,
       NewRunnableFunction(SaveDnsPrefetchStateForNextStartupAndTrimOnIOThread,
-                          prefs->GetMutableList(prefs::kDnsStartupPrefetchList),
-                          prefs->GetMutableList(prefs::kDnsHostReferralList),
-                          &completion));
+          prefs->GetMutableList(prefs::kDnsPrefetchingStartupList),
+          prefs->GetMutableList(prefs::kDnsPrefetchingHostReferralList),
+          &completion));
 
   DCHECK(posted);
   if (posted)
@@ -480,7 +490,8 @@
   // also catch more of the "primary" home pages, since that was (presumably)
   // rendered first (and will be rendered first this time too).
   ListValue* startup_list =
-      local_state->GetMutableList(prefs::kDnsStartupPrefetchList);
+      user_prefs->GetMutableList(prefs::kDnsPrefetchingStartupList);
+
   if (startup_list) {
     ListValue::iterator it = startup_list->begin();
     int format_version = -1;