Integrate registry_hash_store_contents with the rest of tracked prefs.

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 70af00b8b27be0c923c7871dcfec73b68acbc5e5..102e26b694e5a89d3c653e494996d15d6d982bf1 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.h
+++ b/chrome/browser/prefs/profile_pref_store_manager.h
@@ -16,6 +16,7 @@
 #include "base/memory/ref_counted.h"
 #include "components/user_prefs/tracked/pref_hash_filter.h"
 
+class HashStoreContents;
 class PersistentPrefStore;
 class PrefHashStore;
 class PrefService;
@@ -32,6 +33,13 @@ class PrefRegistrySyncable;
 
 class PrefRegistrySimple;
 
+namespace chrome_prefs {

[gab, 2016/08/08 04:37:45]

Make it a static method of ProfilePrefStoreManager instead of adding it to a
top-level namespace.

[proberge, 2016/08/31 17:30:16]

Done.

+// Call before startup tasks kick in to use a different registry path for
+// storing and validating tracked preference MACs. Callers are responsible
+// for ensuring that the key is deleted on shutdown. For testing only.
+void SetPreferenceValidationRegistryPathForTesting(base::string16 path);

[gab, 2016/08/08 04:37:45]

Make this call OS_WIN only (registry isn't generic enough to have it on other
platforms).

[gab, 2016/08/08 04:37:45]

Always pass strings by const&

[proberge, 2016/08/31 17:30:16]

Done.

[proberge, 2016/08/31 17:30:16]

Done.

+}
+
 // Provides a facade through which the user preference store may be accessed and
 // managed.
 class ProfilePrefStoreManager {
@@ -99,6 +107,15 @@ class ProfilePrefStoreManager {
   // TrustedInitialized).
   std::unique_ptr<PrefHashStore> GetPrefHashStore(bool use_super_mac);
 
+  // Returns a PrefHashStore that can be used for extra out-of-band
+  // verifications on this platform (or null if none for this platform).
+  std::unique_ptr<PrefHashStore> GetExternalVerificationPrefHashStore();
+
+  // Returns a HashStoreContents that can be used for extra out-of-band
+  // verifications on this platform (or null if none for this platform).
+  std::unique_ptr<HashStoreContents>
+  GetExternalVerificationPrefHashStoreContents();
+
   const base::FilePath profile_path_;
   const std::vector<PrefHashFilter::TrackedPreferenceMetadata>
       tracking_configuration_;