Integrate registry_hash_store_contents with the rest of tracked prefs.

chrome/browser/prefs/profile_pref_store_manager.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_
 #define CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "components/user_prefs/tracked/pref_hash_filter.h"
 
+class HashStoreContents;
 class PersistentPrefStore;
 class PrefHashStore;
 class PrefService;
 class TrackedPreferenceValidationDelegate;
 
 namespace base {
 class DictionaryValue;
 class SequencedTaskRunner;
 }  // namespace base
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }  // namespace user_prefs
 
 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 {
  public:
   // Instantiates a ProfilePrefStoreManager with the configuration required to
   // manage the user preferences of the profile at |profile_path|.
   // |tracking_configuration| is used for preference tracking.
   // |reporting_ids_count| is the count of all possible tracked preference IDs
   // (possibly greater than |tracking_configuration.size()|).
   // |seed| and |device_id| are used to track preference value changes and must
@@ skipping 47 matching lines @@
       const scoped_refptr<base::SequencedTaskRunner>& io_task_runner);
 
  private:
   // Returns a PrefHashStore for the managed profile. Should only be called
   // if |kPlatformSupportsPreferenceTracking|. |use_super_mac| determines
   // whether the returned object will calculate, store, and validate super MACs
   // (and, by extension, accept non-null newly protected preferences as
   // 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_;
   const size_t reporting_ids_count_;
   const std::string seed_;
   const std::string device_id_;
   PrefService* local_state_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfilePrefStoreManager);
 };
 
 #endif  // CHROME_BROWSER_PREFS_PROFILE_PREF_STORE_MANAGER_H_