Revamp the MigrateBrowserPrefs and MigrateUserPrefs code.

chrome/common/pref_names.cc

 // Copyright (c) 2012 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/common/pref_names.h"
 
 #include "base/basictypes.h"
 #include "chrome/common/pref_font_webkit_names.h"
 
 namespace prefs {
@@ skipping 358 matching lines @@
 // 2 - block all cookies
 const char kCookieBehavior[] = "security.cookie_behavior";
 
 // Boolean which specifies whether we should ask the user if we should download
 // a file (true) or just download it automatically.
 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).
 // This list is adaptively grown and pruned.
 const char kDnsPrefetchingHostReferralList[] =
     "dns_prefetching.host_referral_list";
 
 // Disables the SPDY protocol.
 const char kDisableSpdy[] = "spdy.disabled";
 
@@ skipping 13 matching lines @@
 // Last time that a check for cloud policy management was done. This time is
 // recorded on Android so that retries aren't attempted on every startup.
 // Instead the cloud policy registration is retried at least 1 or 3 days later.
 const char kLastPolicyCheckTime[] = "policy.last_policy_check_time";
 #endif
 
 // Prefix URL for the experimental Instant ZeroSuggest provider.
 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.
 // NOTE: The "dns_prefetching.enabled" value is used so that historical user
 // preferences are not lost.
 // TODO(bnc): Remove kNetworkPredictionEnabled once kNetworkPredictionOptions
 // is functioning as per crbug.com/334602.
 const char kNetworkPredictionEnabled[] = "dns_prefetching.enabled";
 
 // A preference of enum chrome_browser_net::NetworkPredictionOptions shows
@@ skipping 973 matching lines @@
 const char kUninstallLastLaunchTimeSec[] =
     "uninstall_metrics.last_launch_time_sec";
 const char kUninstallLastObservedRunTimeSec[] =
     "uninstall_metrics.last_observed_running_time_sec";
 
 // String containing the version of Chrome for which Chrome will not prompt the
 // user about setting Chrome as the default browser.
 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";
 
 // A collection of position, size, and other data relating to the task
 // manager window to restore on startup.
 const char kTaskManagerWindowPlacement[] = "task_manager.window_placement";
 
 // A collection of position, size, and other data relating to app windows to
 // restore on startup.
 const char kAppWindowPlacement[] = "browser.app_window_placement";
@@ skipping 847 matching lines @@
 // (name and a list of clients that registered the whitelist).
 const char kRegisteredSupervisedUserWhitelists[] =
     "supervised_users.whitelists";
 
 #if defined(ENABLE_EXTENSIONS)
 // Policy that indicates how to handle animated images.
 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
 #endif
 
 }  // namespace prefs