Separate storage for protected preferences into Protected Preferences file.

chrome/browser/prefs/profile_pref_store_manager.h

 // Copyright (c) 2014 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_PROFILE_PREF_STORE_MANAGER_H_
 #define CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 73 matching lines @@
   // the preferences/hash store are concurrently loaded/manipulated by another
   // task.
   void UpdateProfileHashStoreIfRequired(
       const scoped_refptr<base::SequencedTaskRunner>& io_task_runner);
 
   // Initializes the preferences for the managed profile with the preference
   // values in |master_prefs|. Returns true on success.
   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;
 
   // Returns a PrefHashStoreImpl for the managed profile. Should only be called
   // 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_;
   const size_t reporting_ids_count_;

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

Please add a comment describing that this is used for metrics.

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

Added to the constructor in the prior CL:

https://codereview.chromium.org/185543017/diff2/250001:270001/chrome/browser/...

is that sufficient?

   const std::string seed_;
   const std::string device_id_;
   PrefService* local_state_;
 };
 
 #endif  // CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_