Move preference MACs to the protected preference stores.

chrome/browser/prefs/profile_pref_store_manager.h

 // Copyright 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>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/prefs/pref_hash_filter.h"
 
 class PersistentPrefStore;
-class PrefHashStoreImpl;
+class PrefHashStore;
 class PrefService;
 class TrackedPreferenceValidationDelegate;
 
 namespace base {
 class DictionaryValue;
 class SequencedTaskRunner;
 }  // namespace base
 
 namespace user_prefs {
 class PrefRegistrySyncable;
@@ skipping 61 matching lines @@
   // Returns true on success.
   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:
-  // Returns a PrefHashStoreImpl for the managed profile. Should only be called
-  // if |kPlatformSupportsPreferenceTracking|.
-  scoped_ptr<PrefHashStoreImpl> GetPrefHashStoreImpl();
+  // Returns a PrefHashStore for the managed profile. Should only be called
+  // if |kPlatformSupportsPreferenceTracking|. |use_super_mac| determines
+  // whether the returned object will calculate, store, and validate super MACs
+  // (and, by extension, accept non-null newly protected preferences as
+  // TrustedInitialized).
+  scoped_ptr<PrefHashStore> GetPrefHashStore(bool use_super_mac);
 
   const base::FilePath profile_path_;
   const std::vector<PrefHashFilter::TrackedPreferenceMetadata>
       tracking_configuration_;
   const size_t reporting_ids_count_;
   const std::string seed_;
   const std::string device_id_;
   PrefService* local_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfilePrefStoreManager);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_