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

chrome/browser/profiles/profile_impl.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/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 674 matching lines @@
   if (!prefs_.get()) {
     prefs_.reset(PrefService::CreatePrefService(
         GetPrefFilePath(),
         new ExtensionPrefStore(GetExtensionPrefValueMap(), false),
         GetOriginalProfile()));
 
     // The Profile class and ProfileManager class may read some prefs so
     // register known prefs as soon as possible.
     Profile::RegisterUserPrefs(prefs_.get());
     browser::RegisterUserPrefs(prefs_.get());
+    // TODO(mirandac): remove migration code after 6 months (crbug.com/69995).
+    if (g_browser_process->local_state()) {
+      browser::MigrateBrowserPrefs(prefs_.get(),
+                                   g_browser_process->local_state());
+    }
 
     // The last session exited cleanly if there is no pref for
     // kSessionExitedCleanly or the value for kSessionExitedCleanly is true.
     last_session_exited_cleanly_ =
         prefs_->GetBoolean(prefs::kSessionExitedCleanly);
     // Mark the session as open.
     prefs_->SetBoolean(prefs::kSessionExitedCleanly, false);
     // Make sure we save to disk that the session has opened.
     prefs_->ScheduleSavePersistentPrefs();
 
@@ skipping 762 matching lines @@
 }
 
 PrerenderManager* ProfileImpl::GetPrerenderManager() {
   CommandLine* cl = CommandLine::ForCurrentProcess();
   if (!cl->HasSwitch(switches::kEnablePagePrerender))
     return NULL;
   if (!prerender_manager_)
     prerender_manager_ = new PrerenderManager(this);
   return prerender_manager_;
 }