Revert 69320 - Migrate HostReferralList and StartupDNSPrefetchList from local...

chrome/browser/net/predictor_api.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/predictor_api.h"
 
 #include <map>
 #include <string>
 
 #include "base/metrics/field_trial.h"
@@ skipping 115 matching lines @@
 
 void OnTheRecord(bool enable) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (on_the_record_switch == enable)
     return;
   on_the_record_switch = enable;
   if (on_the_record_switch)
     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);
 }
 
 // When enabled, we use the following instance to service all requests in the
 // browser process.
 // TODO(willchan): Look at killing this.
 static Predictor* g_predictor = NULL;
 
 // This API is only used in the browser process.
 // It is called from an IPC message originating in the renderer.  It currently
@@ skipping 234 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   bool prefetching_enabled =
       user_prefs->GetBoolean(prefs::kDnsPrefetchingEnabled);
 
   // Gather the list of hostnames to prefetch on startup.
   UrlList urls =
       GetPredictedUrlListAtStartup(user_prefs, local_state);
 
   ListValue* referral_list =
-      static_cast<ListValue*>(user_prefs->GetMutableList(
-          prefs::kDnsPrefetchingHostReferralList)->DeepCopy());
-
-  // Remove obsolete preferences from local state if necessary.
-  bool 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);
-  }
+      static_cast<ListValue*>(
+          local_state->GetMutableList(prefs::kDnsHostReferralList)->DeepCopy());
 
   g_browser_process->io_thread()->InitNetworkPredictor(
       prefetching_enabled, max_dns_queue_delay, max_parallel_resolves, urls,
       referral_list, preconnect_enabled);
 }
 
 void FinalizePredictorInitialization(
     Predictor* global_predictor,
     const UrlList& startup_urls,
     ListValue* referral_list) {
@@ skipping 47 matching lines @@
 
   if (!predictor_enabled || g_predictor == NULL)
     return;
 
   base::WaitableEvent completion(true, false);
 
   bool posted = BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       NewRunnableFunction(SaveDnsPrefetchStateForNextStartupAndTrimOnIOThread,
-          prefs->GetMutableList(prefs::kDnsPrefetchingStartupList),
-          prefs->GetMutableList(prefs::kDnsPrefetchingHostReferralList),
-          &completion));
+                          prefs->GetMutableList(prefs::kDnsStartupPrefetchList),
+                          prefs->GetMutableList(prefs::kDnsHostReferralList),
+                          &completion));
 
   DCHECK(posted);
   if (posted)
     completion.Wait();
 }
 
 static UrlList GetPredictedUrlListAtStartup(PrefService* user_prefs,
                                             PrefService* local_state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   UrlList urls;
   // Recall list of URLs we learned about during last session.
   // This may catch secondary hostnames, pulled in by the homepages.  It will
   // 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 =
-      user_prefs->GetMutableList(prefs::kDnsPrefetchingStartupList);
-
+      local_state->GetMutableList(prefs::kDnsStartupPrefetchList);
   if (startup_list) {
     ListValue::iterator it = startup_list->begin();
     int format_version = -1;
     if (it != startup_list->end() &&
         (*it)->GetAsInteger(&format_version) &&
         format_version == kPredictorStartupFormatVersion) {
       ++it;
       for (; it != startup_list->end(); ++it) {
         std::string url_spec;
         if (!(*it)->GetAsString(&url_spec)) {
@@ skipping 120 matching lines @@
     DCHECK(!g_predictor);
     InitNetworkPredictor(max_queueing_delay, max_parallel_resolves, user_prefs,
                          local_state, preconnect_enabled);
   }
 }
 
 PredictorInit::~PredictorInit() {
 }
 
 }  // namespace chrome_browser_net