Remove user-related data from local_state and add to user_preferences, i...

chrome/browser/prefs/browser_prefs.cc

 // Copyright (c) 2011 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/prefs/browser_prefs.h"
 
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/background_mode_manager.h"
@@ skipping 36 matching lines @@
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/browser/sync/signin_manager.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/pinned_tab_codec.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/upgrade_detector.h"
+#include "chrome/common/pref_names.h"
 
 #if defined(TOOLKIT_VIEWS)  // TODO(port): whittle this down as we port
 #include "chrome/browser/ui/views/browser_actions_container.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/gtk/browser_window_gtk.h"
 #endif
 
@@ skipping 81 matching lines @@
 #if defined(OS_CHROMEOS)
   chromeos::Preferences::RegisterUserPrefs(user_prefs);
 #endif
   BackgroundContentsService::RegisterUserPrefs(user_prefs);
   SigninManager::RegisterUserPrefs(user_prefs);
   TemplateURLModel::RegisterUserPrefs(user_prefs);
   InstantController::RegisterUserPrefs(user_prefs);
   NetPrefObserver::RegisterPrefs(user_prefs);
 }
 
+void ClearObsoletePrefs(PrefService* user_prefs, PrefService* local_state) {
+  // Remove prefs which have been moved to user_prefs from local_state.
+  int current_version =
+      user_prefs->GetInteger(prefs::kMultipleProfilePrefMigration);
+  switch (current_version) {
+    case 0:
+      // Remove the dns preferences.
+      local_state->RegisterListPref(prefs::kDnsStartupPrefetchList);
+      local_state->RegisterListPref(prefs::kDnsHostReferralList);
+      local_state->ClearPref(prefs::kDnsStartupPrefetchList);
+      local_state->ClearPref(prefs::kDnsHostReferralList);
+      // FALL THROUGH
+
+    case 1:
+      // Remove the devtools preference.
+      local_state->RegisterIntegerPref(prefs::kDevToolsSplitLocation, -1);
+      local_state->ClearPref(prefs::kDevToolsSplitLocation);
+
+      // Remove the browser preferences.
+      local_state->RegisterDictionaryPref(prefs::kBrowserWindowPlacement);
+      local_state->ClearPref(prefs::kBrowserWindowPlacement);
+      // FALL THROUGH
+
+      // In the last case, set the new state of the preferences migration.
+      user_prefs->SetInteger(prefs::kMultipleProfilePrefMigration, 2);
+  }
+}
+
 }  // namespace browser