Separate storage for protected preferences into Protected Preferences file.

chrome/browser/prefs/profile_pref_store_manager.h

Index: chrome/browser/prefs/profile_pref_store_manager.h
diff --git a/chrome/browser/prefs/profile_pref_store_manager.h b/chrome/browser/prefs/profile_pref_store_manager.h
index 079e9d8618339a58d684acac71b8a6412f76109a..0783ccec44e251033b932db03afb04a717b5f9a0 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.h
+++ b/chrome/browser/prefs/profile_pref_store_manager.h
@@ -91,6 +91,11 @@ class ProfilePrefStoreManager {
   bool InitializePrefsFromMasterPrefs(
       const base::DictionaryValue& master_prefs);
 
+  // Creates a single-file PrefStore as was used in M34 and earlier. Used for

[robertshield, 2014/03/25 03:05:12]

nit: Used only for..

[erikwright (departed), 2014/03/25 20:28:26]

Done.

+  // testing migration.
+  PersistentPrefStore* CreateDeprecatedCombinedProfilePrefStore(
+      const scoped_refptr<base::SequencedTaskRunner>& io_task_runner);
+
  private:
   class InitializeHashStoreObserver;
 
@@ -98,6 +103,10 @@ class ProfilePrefStoreManager {
   // if |kPlatformSupportsPreferenceTracking|.
   scoped_ptr<PrefHashStoreImpl> GetPrefHashStoreImpl();
 
+  // Returns a PrefHashStore that is a copy of the current state of the real
+  // hash store.
+  scoped_ptr<PrefHashStore> CopyPrefHashStore();
+
   const base::FilePath profile_path_;
   const std::vector<PrefHashFilter::TrackedPreferenceMetadata>
       tracking_configuration_;