Revamp the MigrateBrowserPrefs and MigrateUserPrefs code.

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 9aea51b666f6bc6ef7a6b7d429dffe18a83abf6d..35fc55cabb7a84a947ad8ef2fa8cd7b5d3d0a63b 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -376,18 +376,10 @@ const char kPromptForDownload[] = "download.prompt_for_download";
 // A boolean pref set to true if we're using Link Doctor error pages.
 const char kAlternateErrorPagesEnabled[] = "alternate_error_pages.enabled";
 
-// OBSOLETE: new pref now stored with user prefs instead of profile, as
-// kDnsPrefetchingStartupList.
-const char kDnsStartupPrefetchList[] = "StartupDNSPrefetchList";

[gab, 2015/02/23 16:09:38]

Also remove declaration in header for all prefs removed from this file.

[rkaplow, 2015/02/23 23:27:53]

Done.

-
 // 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";
 
-// OBSOLETE: new pref now stored with user prefs instead of profile, as
-// kDnsPrefetchingHostReferralList.
-const char kDnsHostReferralList[] = "HostReferralList";
-
 // 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).
@@ -421,16 +413,6 @@ const char kLastPolicyCheckTime[] = "policy.last_policy_check_time";
 const char kInstantUIZeroSuggestUrlPrefix[] =
     "instant_ui.zero_suggest_url_prefix";
 
-// Used to migrate preferences from local state to user preferences to
-// enable multiple profiles.
-// BITMASK with possible values (see browser_prefs.cc for enum):
-// 0: No preferences migrated.
-// 1: DNS preferences migrated: kDnsPrefetchingStartupList and HostReferralList
-// 2: Browser window preferences migrated: kDevToolsSplitLocation and
-//    kBrowserWindowPlacement
-const char kMultipleProfilePrefMigration[] =
-    "local_state.multiple_profile_prefs_version";
-
 // A boolean pref set to true if prediction of network actions is allowed.
 // Actions include DNS prefetching, TCP and SSL preconnection, prerendering
 // of web pages, and resource prefetching.
@@ -1424,10 +1406,6 @@ const char kUninstallLastObservedRunTimeSec[] =
 const char kBrowserSuppressDefaultBrowserPrompt[] =
     "browser.suppress_default_browser_prompt_for_version";
 
-// A collection of position, size, and other data relating to the browser
-// window to restore on startup.
-const char kBrowserWindowPlacement[] = "browser.window_placement";

[gab, 2015/02/23 16:09:38]

Do not remove this.

[rkaplow, 2015/02/23 23:27:53]

Done.

-
 // Browser window placement for popup windows.
 const char kBrowserWindowPlacementPopup[] = "browser.window_placement_popup";