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

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
===================================================================
--- chrome/common/pref_names.cc	(revision 69325)
+++ chrome/common/pref_names.cc	(working copy)
@@ -194,28 +194,19 @@
 // A boolean pref set to true if DNS pre-fetching is being done in browser.
 const char kDnsPrefetchingEnabled[] = "dns_prefetching.enabled";
 
-// OBSOLETE: new pref now stored with user prefs instead of profile, as
-// kDnsPrefetchingStartupList.
-const char kDnsStartupPrefetchList[] = "StartupDNSPrefetchList";
-
 // An adaptively identified list of domain names to be pre-fetched during the
 // next startup, based on what was actually needed during this startup.
-const char kDnsPrefetchingStartupList[] = "dns_prefetching.startup_list";
+const char kDnsStartupPrefetchList[] = "StartupDNSPrefetchList";
 
-// OBSOLETE: new pref now stored with user prefs instead of profile, as
-// kDnsPrefetchingHostReferralList.
-const char kDnsHostReferralList[] = "HostReferralList";
+// Disables the SPDY protocol.
+const char kDisableSpdy[] = "spdy.disabled";
 
 // A list of host names used to fetch web pages, and their commonly used
 // sub-resource hostnames (and expected latency benefits from pre-resolving, or
 // preconnecting to, such sub-resource hostnames).
 // This list is adaptively grown and pruned.
-const char kDnsPrefetchingHostReferralList[] =
-    "dns_prefetching.host_referral_list";
+const char kDnsHostReferralList[] = "HostReferralList";
 
-// Disables the SPDY protocol.
-const char kDisableSpdy[] = "spdy.disabled";
-
 // Is the cookie prompt expanded?
 const char kCookiePromptExpanded[] = "cookieprompt.expanded";
 
@@ -235,14 +226,6 @@
 // that are used.
 const char kInstantPromo[] = "instant.promo";
 
-// Used to migrate preferences from local state to user preferences to
-// enable multiple profiles.
-// Holds possible values:
-// 0: no preferences migrated yet.
-// 1: dns prefetching preferences stored in user preferences.
-const char kMultipleProfilePrefMigration[] =
-    "profile.multiple_profile_prefs_version";
-
 #if defined(USE_NSS) || defined(USE_OPENSSL)
 // Prefs for SSLConfigServicePref.  Currently, these are only present on
 // and used by NSS/OpenSSL using OSes.
Property changes on: chrome/common/pref_names.cc
___________________________________________________________________
Added: svn:mergeinfo