Move preference MACs to the protected preference stores.

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 dafd7d5305e2b15272a5120f4559d82b69943c75..0d64ca3868bc8e26aacc6c1f14b40f866ab0a797 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.h
+++ b/chrome/browser/prefs/profile_pref_store_manager.h
@@ -78,9 +78,6 @@ class ProfilePrefStoreManager {
   // was built by ProfilePrefStoreManager.
   static void ClearResetTime(PrefService* pref_service);
 
-  // Deletes stored hashes for the managed profile.
-  void ResetPrefHashStore();
-
   // Creates a PersistentPrefStore providing access to the user preferences of
   // the managed profile. An optional |validation_delegate| will be notified
   // of the status of each tracked preference as they are checked.
@@ -88,13 +85,6 @@ class ProfilePrefStoreManager {
       const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
       TrackedPreferenceValidationDelegate* validation_delegate);
 
-  // Checks the presence/version of the hash store for the managed profile and
-  // creates or updates it if necessary. Completes asynchronously and is safe if
-  // 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|. Acts synchronously, including blocking IO.
   // Returns true on success.
@@ -109,7 +99,9 @@ class ProfilePrefStoreManager {
  private:
   // Returns a PrefHashStoreImpl for the managed profile. Should only be called
   // if |kPlatformSupportsPreferenceTracking|.
-  scoped_ptr<PrefHashStoreImpl> GetPrefHashStoreImpl();
+  scoped_ptr<PrefHashStoreImpl> GetPrefHashStoreImpl(bool use_super_mac);
+
+  scoped_ptr<PrefHashStoreImpl> GetLegacyPrefHashStoreImpl();
 
   const base::FilePath profile_path_;
   const std::vector<PrefHashFilter::TrackedPreferenceMetadata>