Move preference MACs to the protected preference stores.

chrome/browser/prefs/pref_hash_store_impl.h

Index: chrome/browser/prefs/pref_hash_store_impl.h
diff --git a/chrome/browser/prefs/pref_hash_store_impl.h b/chrome/browser/prefs/pref_hash_store_impl.h
index 38fd19f96c07d1218f9fb472fbcd0167e2c06061..44dd32454661074fefd2fda3e203666f1a37212e 100644
--- a/chrome/browser/prefs/pref_hash_store_impl.h
+++ b/chrome/browser/prefs/pref_hash_store_impl.h
@@ -42,7 +42,6 @@ class PrefHashStoreImpl : public PrefHashStore {
   // previously stored hashes in |contents|.
   PrefHashStoreImpl(const std::string& seed,
                     const std::string& device_id,
-                    scoped_ptr<HashStoreContents> contents,
                     bool use_super_mac);
 
   virtual ~PrefHashStoreImpl();
@@ -52,21 +51,15 @@ class PrefHashStoreImpl : public PrefHashStore {
   void Reset();
 
   // PrefHashStore implementation.
-  virtual scoped_ptr<PrefHashStoreTransaction> BeginTransaction() OVERRIDE;
-  virtual void CommitPendingWrite() OVERRIDE;
+  virtual scoped_ptr<PrefHashStoreTransaction> BeginTransaction(
+      base::DictionaryValue* storage) OVERRIDE;
 
  private:
   class PrefHashStoreTransactionImpl;
 
   const PrefHashCalculator pref_hash_calculator_;
-  scoped_ptr<HashStoreContents> contents_;
-  const bool initial_hashes_dictionary_trusted_;
   bool use_super_mac_;
 
-  // True if hashes have been modified since the last call to
-  // CommitPendingWriteIfRequired().
-  bool has_pending_write_;
-
   DISALLOW_COPY_AND_ASSIGN(PrefHashStoreImpl);
 };