Integrate registry_hash_store_contents with the rest of tracked prefs.

components/user_prefs/tracked/tracked_preference_helper.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 COMPONENTS_USER_PREFS_TRACKED_TRACKED_PREFERENCE_HELPER_H_
 #define COMPONENTS_USER_PREFS_TRACKED_TRACKED_PREFERENCE_HELPER_H_
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/macros.h"
+#include "components/user_prefs/tracked/hash_store_contents.h"
 #include "components/user_prefs/tracked/pref_hash_filter.h"
 #include "components/user_prefs/tracked/pref_hash_store_transaction.h"
 
 // A TrackedPreferenceHelper is a helper class for TrackedPreference which
 // handles decision making and reporting for TrackedPreference's
 // implementations.
 class TrackedPreferenceHelper {
  public:
   enum ResetAction {
     DONT_RESET,
@@ skipping 11 matching lines @@
 
   // Returns a ResetAction stating whether a reset is desired (DO_RESET) or not
   // (DONT_RESET) based on observing |value_state|. Can also return WANTED_RESET
   // if a reset would have been desired but the current |enforcement_level|
   // doesn't allow it.
   ResetAction GetAction(PrefHashStoreTransaction::ValueState value_state) const;
 
   // Returns true if the preference value may contain personal information.
   bool IsPersonal() const;
 
   // Reports |value_state| via UMA under |reporting_id_|.

[gab, 2016/08/03 18:19:36]

// Reports |value_state| via UMA under |reporting_id_|. |uma_prefix| will be
prepended to all metrics if non-empty.

[proberge, 2016/08/04 00:13:47]

Done, but keeping |validation_type| for now.

-  void ReportValidationResult(
-      PrefHashStoreTransaction::ValueState value_state) const;
+  void ReportValidationResult(PrefHashStoreTransaction::ValueState value_state,
+                              HashStoreContentsType validation_type) const;

[gab, 2016/08/03 18:19:36]

As mentioned above, I think this could just be

const std::string& uma_prefix

[proberge, 2016/08/04 00:13:47]

Ack, see above reply

 
   // Reports |reset_action| via UMA under |reporting_id_|.
   void ReportAction(ResetAction reset_action) const;
 
   // Reports, via UMA, the |count| of split preference entries that were
   // considered invalid in a CHANGED event.
   void ReportSplitPreferenceChangedCount(size_t count) const;
 
  private:
   const std::string pref_path_;
 
   const size_t reporting_id_;
   const size_t reporting_ids_count_;
 
   // Deny setting changes and hash seeding/migration.
   const bool enforce_;
 
   const bool personal_;
 
   DISALLOW_COPY_AND_ASSIGN(TrackedPreferenceHelper);
 };
 
 #endif  // COMPONENTS_USER_PREFS_TRACKED_TRACKED_PREFERENCE_HELPER_H_