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 ca835f6a6a314ec1be48b88f0fc0d5bfe74ce263..4f7baa5067da2708fa6e90350ad48c3522e3b0fe 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.h
+++ b/chrome/browser/prefs/profile_pref_store_manager.h
@@ -91,15 +91,10 @@ 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:
   // 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);
 
   const base::FilePath profile_path_;
   const std::vector<PrefHashFilter::TrackedPreferenceMetadata>