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 f75d3d0eef4436daab6b6e1833a12c651827c2d9..9463d0b4fe3d976f23d14e067df7a627f809f7a6 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.h
+++ b/chrome/browser/prefs/profile_pref_store_manager.h
@@ -98,6 +98,11 @@ class ProfilePrefStoreManager {
   bool InitializePrefsFromMasterPrefs(
       const base::DictionaryValue& master_prefs);
 
+  // Creates a single-file PrefStore as was used in M34 and earlier. Used only
+  // for testing migration.
+  PersistentPrefStore* CreateDeprecatedCombinedProfilePrefStore(
+      const scoped_refptr<base::SequencedTaskRunner>& io_task_runner);
+
  private:
   class InitializeHashStoreObserver;
 
@@ -105,6 +110,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_;