Integrate registry_hash_store_contents with the rest of tracked prefs.

components/user_prefs/tracked/pref_hash_store_impl.cc

Index: components/user_prefs/tracked/pref_hash_store_impl.cc
diff --git a/components/user_prefs/tracked/pref_hash_store_impl.cc b/components/user_prefs/tracked/pref_hash_store_impl.cc
index 80438d6954a45c9c791a2c7d620e108fdeff3141..029ad07715b1a00c55cf231a256972d00d1baa07 100644
--- a/components/user_prefs/tracked/pref_hash_store_impl.cc
+++ b/components/user_prefs/tracked/pref_hash_store_impl.cc
@@ -9,6 +9,7 @@
 
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"

[gab, 2016/09/16 19:47:33]

Not needed?

[proberge, 2016/09/20 21:35:45]

Reverted changes to this file; probably a bad merge.

 #include "base/metrics/histogram.h"
 #include "components/user_prefs/tracked/hash_store_contents.h"
 
@@ -60,7 +61,7 @@ PrefHashStoreImpl::~PrefHashStoreImpl() {
 std::unique_ptr<PrefHashStoreTransaction> PrefHashStoreImpl::BeginTransaction(
     HashStoreContents* storage) {
   return std::unique_ptr<PrefHashStoreTransaction>(
-      new PrefHashStoreTransactionImpl(this, std::move(storage)));
+      new PrefHashStoreTransactionImpl(this, storage));
 }
 
 std::string PrefHashStoreImpl::ComputeMac(const std::string& path,
@@ -96,7 +97,7 @@ PrefHashStoreImpl::PrefHashStoreTransactionImpl::PrefHashStoreTransactionImpl(
     PrefHashStoreImpl* outer,
     HashStoreContents* storage)
     : outer_(outer),
-      contents_(std::move(storage)),
+      contents_(storage),
       super_mac_valid_(false),
       super_mac_dirty_(false) {
   if (!outer_->use_super_mac_)