Move tracked prefs into services/preferences/tracked.

services/preferences/tracked/tracked_atomic_preference.cc

Index: services/preferences/tracked/tracked_atomic_preference.cc
diff --git a/components/user_prefs/tracked/tracked_atomic_preference.cc b/services/preferences/tracked/tracked_atomic_preference.cc
similarity index 80%
rename from components/user_prefs/tracked/tracked_atomic_preference.cc
rename to services/preferences/tracked/tracked_atomic_preference.cc
index 1eb86f6a03c9adab26e81ea748c1994fc6f28dc4..8df3a3609fa096f6651669c88a17f668111c8dd0 100644
--- a/components/user_prefs/tracked/tracked_atomic_preference.cc
+++ b/services/preferences/tracked/tracked_atomic_preference.cc
@@ -2,18 +2,21 @@
 // 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_atomic_preference.h"
+#include "services/preferences/tracked/tracked_atomic_preference.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;
 
 TrackedAtomicPreference::TrackedAtomicPreference(
     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,
@@ -39,12 +42,10 @@ bool TrackedAtomicPreference::EnforceAndReport(
     PrefHashStoreTransaction* external_validation_transaction) const {
   const base::Value* value = NULL;
   pref_store_contents->Get(pref_path_, &value);
-  PrefHashStoreTransaction::ValueState value_state =
-      transaction->CheckValue(pref_path_, value);
+  ValueState value_state = transaction->CheckValue(pref_path_, value);
   helper_.ReportValidationResult(value_state, transaction->GetStoreUMASuffix());
 
-  PrefHashStoreTransaction::ValueState external_validation_value_state =
-      PrefHashStoreTransaction::UNSUPPORTED;
+  ValueState external_validation_value_state = ValueState::UNSUPPORTED;
   if (external_validation_transaction) {
     external_validation_value_state =
         external_validation_transaction->CheckValue(pref_path_, value);
@@ -68,7 +69,7 @@ bool TrackedAtomicPreference::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::Value* new_value = NULL;
     pref_store_contents->Get(pref_path_, &new_value);
@@ -78,9 +79,7 @@ bool TrackedAtomicPreference::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::Value* new_value = nullptr;
     pref_store_contents->Get(pref_path_, &new_value);
     external_validation_transaction->StoreHash(pref_path_, new_value);