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

chrome/browser/prefs/browser_prefs.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CHROME_BROWSER_PREFS_BROWSER_PREFS_H__
 #define CHROME_BROWSER_PREFS_BROWSER_PREFS_H__
 #pragma once
 
 class PrefService;
 
 namespace browser {
 
+// Bitmask for kMultipleProfilePrefMigration.
+enum MigratedPreferences {
+  NO_PREFS = 0,
+  DNS_PREFS = 1 << 0,
+  WINDOWS_PREFS = 1 << 1,
+};
+
 // Makes the PrefService objects aware of all the prefs.
 void RegisterAllPrefs(PrefService* user_prefs, PrefService* local_state);
 void RegisterLocalState(PrefService* local_state);
 void RegisterUserPrefs(PrefService* user_prefs);
-
+// Migrate prefs from local_state to user_prefs.
+void MigrateBrowserPrefs(PrefService* user_prefs, PrefService* local_state);
 } // namespace browser
 
 #endif  // CHROME_BROWSER_PREFS_BROWSER_PREFS_H__