Revert 72153 - Remove user-related data from local_state and add to user_pre...

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"
 #include "base/lazy_instance.h"
 #include "base/stl_util-inl.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/io_thread.h"
 #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"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "net/base/host_resolver.h"
 #include "net/base/host_resolver_impl.h"
 
@@ skipping 354 matching lines @@
 
   // 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.
-  int current_version =
-      local_state->GetInteger(prefs::kMultipleProfilePrefMigration);
-  if ((current_version & browser::DNS_PREFS) == 0) {
+  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);
-    local_state->SetInteger(prefs::kMultipleProfilePrefMigration,
-        current_version | browser::DNS_PREFS);
+    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);
 }
 
 void FinalizePredictorInitialization(
     Predictor* global_predictor,
     const UrlList& startup_urls,
@@ skipping 207 matching lines @@
     DCHECK(!g_predictor);
     InitNetworkPredictor(max_queueing_delay, max_parallel_resolves, user_prefs,
                          local_state, preconnect_enabled);
   }
 }
 
 PredictorInit::~PredictorInit() {
 }
 
 }  // namespace chrome_browser_net