Integrate registry_hash_store_contents with the rest of tracked prefs.

components/user_prefs/tracked/tracked_preference_helper.h

Index: components/user_prefs/tracked/tracked_preference_helper.h
diff --git a/components/user_prefs/tracked/tracked_preference_helper.h b/components/user_prefs/tracked/tracked_preference_helper.h
index 883e3e8f78908062497b0197460e5be3c7025145..9de1bae46d19c419384efa419e5244022b6741ca 100644
--- a/components/user_prefs/tracked/tracked_preference_helper.h
+++ b/components/user_prefs/tracked/tracked_preference_helper.h
@@ -10,6 +10,7 @@
 #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"
 
@@ -41,9 +42,10 @@ class TrackedPreferenceHelper {
   // Returns true if the preference value may contain personal information.
   bool IsPersonal() const;
 
-  // Reports |value_state| via UMA under |reporting_id_|.
-  void ReportValidationResult(
-      PrefHashStoreTransaction::ValueState value_state) const;
+  // Reports |value_state| via UMA under |reporting_id_|. |validation_type| will
+  // be used to choose the correct histogram name.
+  void ReportValidationResult(PrefHashStoreTransaction::ValueState value_state,
+                              const std::string& validation_type_suffix) const;
 
   // Reports |reset_action| via UMA under |reporting_id_|.
   void ReportAction(ResetAction reset_action) const;