Integrate registry_hash_store_contents with the rest of tracked prefs.

components/user_prefs/tracked/registry_hash_store_contents_win.h

Index: components/user_prefs/tracked/registry_hash_store_contents_win.h
diff --git a/components/user_prefs/tracked/registry_hash_store_contents_win.h b/components/user_prefs/tracked/registry_hash_store_contents_win.h
index c18245e86f0f37d7e4c44abc811a4bfc35819b8e..b31aea24be4b8ba2e4d0f8c58171206c7ba568d1 100644
--- a/components/user_prefs/tracked/registry_hash_store_contents_win.h
+++ b/components/user_prefs/tracked/registry_hash_store_contents_win.h
@@ -18,6 +18,8 @@ class RegistryHashStoreContentsWin : public HashStoreContents {
                                         const base::string16& store_key);
 
   // HashStoreContents overrides:
+  bool IsCopyable() const override;
+  std::unique_ptr<HashStoreContents> MakeCopy() const override;
   base::StringPiece GetUMASuffix() const override;
   void Reset() override;
   bool GetMac(const std::string& path, std::string* out_value) override;
@@ -37,6 +39,10 @@ class RegistryHashStoreContentsWin : public HashStoreContents {
   void SetSuperMac(const std::string& super_mac) override;
 
  private:
+  // Helper constructor for |MakeCopy|.
+  explicit RegistryHashStoreContentsWin(
+      const base::string16& preference_key_name);

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

Instead define the default copy constructor as private here, i.e.

explicit RegistryHashStoreContentsWin(const RegistryHashStoreContentsWin&
other);

and in .cc

RegistryHashStoreContentsWin::RegistryHashStoreContentsWin(
    const RegistryHashStoreContentsWin& other) = default;

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

Done, but had to remove the DISALLOW_COPY_AND_ASSIGN.

+
   const base::string16 preference_key_name_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistryHashStoreContentsWin);