Move tracked prefs into services/preferences/tracked.

services/preferences/tracked/tracked_split_preference.cc

Index: services/preferences/tracked/tracked_split_preference.cc
diff --git a/components/user_prefs/tracked/tracked_split_preference.cc b/services/preferences/tracked/tracked_split_preference.cc
similarity index 84%
rename from components/user_prefs/tracked/tracked_split_preference.cc
rename to services/preferences/tracked/tracked_split_preference.cc
index c2af4d61a4406f0df2733f1c8600da307b6325b0..da6ceba8fbfd16df6891aa2cd89e8c1c3ca48e58 100644
--- a/components/user_prefs/tracked/tracked_split_preference.cc
+++ b/services/preferences/tracked/tracked_split_preference.cc
@@ -2,21 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/user_prefs/tracked/tracked_split_preference.h"
+#include "services/preferences/tracked/tracked_split_preference.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/values.h"
-#include "components/user_prefs/tracked/pref_hash_store_transaction.h"
 #include "services/preferences/public/interfaces/tracked_preference_validation_delegate.mojom.h"
+#include "services/preferences/tracked/pref_hash_store_transaction.h"
+
+using ValueState =
+    prefs::mojom::TrackedPreferenceValidationDelegate::ValueState;
 
 TrackedSplitPreference::TrackedSplitPreference(
     const std::string& pref_path,
     size_t reporting_id,
     size_t reporting_ids_count,
-    PrefHashFilter::EnforcementLevel enforcement_level,
-    PrefHashFilter::ValueType value_type,
+    prefs::mojom::TrackedPreferenceMetadata::EnforcementLevel enforcement_level,
+    prefs::mojom::TrackedPreferenceMetadata::ValueType value_type,
     prefs::mojom::TrackedPreferenceValidationDelegate* delegate)
     : pref_path_(pref_path),
       helper_(pref_path,
@@ -54,16 +57,15 @@ bool TrackedSplitPreference::EnforceAndReport(
   }
 
   std::vector<std::string> invalid_keys;
-  PrefHashStoreTransaction::ValueState value_state =
+  ValueState value_state =
       transaction->CheckSplitValue(pref_path_, dict_value, &invalid_keys);
 
-  if (value_state == PrefHashStoreTransaction::CHANGED)
+  if (value_state == ValueState::CHANGED)
     helper_.ReportSplitPreferenceChangedCount(invalid_keys.size());
 
   helper_.ReportValidationResult(value_state, transaction->GetStoreUMASuffix());
 
-  PrefHashStoreTransaction::ValueState external_validation_value_state =
-      PrefHashStoreTransaction::UNSUPPORTED;
+  ValueState external_validation_value_state = ValueState::UNSUPPORTED;
   std::vector<std::string> external_validation_invalid_keys;
   if (external_validation_transaction) {
     external_validation_value_state =
@@ -85,7 +87,7 @@ bool TrackedSplitPreference::EnforceAndReport(
 
   bool was_reset = false;
   if (reset_action == TrackedPreferenceHelper::DO_RESET) {
-    if (value_state == PrefHashStoreTransaction::CHANGED) {
+    if (value_state == ValueState::CHANGED) {
       DCHECK(!invalid_keys.empty());
 
       for (std::vector<std::string>::const_iterator it = invalid_keys.begin();
@@ -98,7 +100,7 @@ bool TrackedSplitPreference::EnforceAndReport(
     was_reset = true;
   }
 
-  if (value_state != PrefHashStoreTransaction::UNCHANGED) {
+  if (value_state != ValueState::UNCHANGED) {
     // Store the hash for the new value (whether it was reset or not).
     const base::DictionaryValue* new_dict_value = NULL;
     pref_store_contents->GetDictionary(pref_path_, &new_dict_value);
@@ -108,9 +110,7 @@ bool TrackedSplitPreference::EnforceAndReport(
   // Update MACs in the external store if there is one and there either was a
   // reset or external validation failed.
   if (external_validation_transaction &&
-      (was_reset ||
-       external_validation_value_state !=
-           PrefHashStoreTransaction::UNCHANGED)) {
+      (was_reset || external_validation_value_state != ValueState::UNCHANGED)) {
     const base::DictionaryValue* new_dict_value = nullptr;
     pref_store_contents->GetDictionary(pref_path_, &new_dict_value);
     external_validation_transaction->StoreSplitHash(pref_path_, new_dict_value);