Index: services/preferences/tracked/tracked_preference_helper.cc |
diff --git a/components/user_prefs/tracked/tracked_preference_helper.cc b/services/preferences/tracked/tracked_preference_helper.cc |
similarity index 72% |
rename from components/user_prefs/tracked/tracked_preference_helper.cc |
rename to services/preferences/tracked/tracked_preference_helper.cc |
index fce26b931d3e716e137ffdce1bfd1830a4a02cc7..d368ddb2f002806b56741f39a9d7d2a7395ca79b 100644 |
--- a/components/user_prefs/tracked/tracked_preference_helper.cc |
+++ b/services/preferences/tracked/tracked_preference_helper.cc |
@@ -2,52 +2,55 @@ |
// 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_preference_helper.h" |
+#include "services/preferences/tracked/tracked_preference_helper.h" |
#include "base/logging.h" |
#include "base/metrics/histogram.h" |
#include "base/metrics/histogram_macros.h" |
-#include "components/user_prefs/tracked/tracked_preference_histogram_names.h" |
+#include "services/preferences/public/cpp/tracked/tracked_preference_histogram_names.h" |
+ |
+using ValueState = |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState; |
TrackedPreferenceHelper::TrackedPreferenceHelper( |
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) |
: pref_path_(pref_path), |
reporting_id_(reporting_id), |
reporting_ids_count_(reporting_ids_count), |
- enforce_(enforcement_level == |
- PrefHashFilter::EnforcementLevel::ENFORCE_ON_LOAD), |
- personal_(value_type == PrefHashFilter::ValueType::PERSONAL) {} |
+ enforce_(enforcement_level == prefs::mojom::TrackedPreferenceMetadata:: |
+ EnforcementLevel::ENFORCE_ON_LOAD), |
+ personal_(value_type == |
+ prefs::mojom::TrackedPreferenceMetadata::ValueType::PERSONAL) {} |
TrackedPreferenceHelper::ResetAction TrackedPreferenceHelper::GetAction( |
- PrefHashStoreTransaction::ValueState value_state) const { |
+ ValueState value_state) const { |
switch (value_state) { |
- case PrefHashStoreTransaction::UNCHANGED: |
+ case ValueState::UNCHANGED: |
// Desired case, nothing to do. |
return DONT_RESET; |
- case PrefHashStoreTransaction::CLEARED: |
+ case ValueState::CLEARED: |
// Unfortunate case, but there is nothing we can do. |
return DONT_RESET; |
- case PrefHashStoreTransaction::TRUSTED_NULL_VALUE: // Falls through. |
- case PrefHashStoreTransaction::TRUSTED_UNKNOWN_VALUE: |
+ case ValueState::TRUSTED_NULL_VALUE: // Falls through. |
+ case ValueState::TRUSTED_UNKNOWN_VALUE: |
// It is okay to seed the hash in this case. |
return DONT_RESET; |
- case PrefHashStoreTransaction::SECURE_LEGACY: |
+ case ValueState::SECURE_LEGACY: |
// Accept secure legacy device ID based hashes. |
return DONT_RESET; |
- case PrefHashStoreTransaction::UNSUPPORTED: |
+ case ValueState::UNSUPPORTED: |
NOTREACHED() |
<< "GetAction should not be called with an UNSUPPORTED value state"; |
return DONT_RESET; |
- case PrefHashStoreTransaction::UNTRUSTED_UNKNOWN_VALUE: // Falls through. |
- case PrefHashStoreTransaction::CHANGED: |
+ case ValueState::UNTRUSTED_UNKNOWN_VALUE: // Falls through. |
+ case ValueState::CHANGED: |
return enforce_ ? DO_RESET : WANTED_RESET; |
} |
- NOTREACHED() << "Unexpected PrefHashStoreTransaction::ValueState: " |
- << value_state; |
+ NOTREACHED() << "Unexpected ValueState: " << value_state; |
return DONT_RESET; |
} |
@@ -56,35 +59,35 @@ bool TrackedPreferenceHelper::IsPersonal() const { |
} |
void TrackedPreferenceHelper::ReportValidationResult( |
- PrefHashStoreTransaction::ValueState value_state, |
+ ValueState value_state, |
base::StringPiece validation_type_suffix) const { |
const char* histogram_name = nullptr; |
switch (value_state) { |
- case PrefHashStoreTransaction::UNCHANGED: |
+ case ValueState::UNCHANGED: |
histogram_name = user_prefs::tracked::kTrackedPrefHistogramUnchanged; |
break; |
- case PrefHashStoreTransaction::CLEARED: |
+ case ValueState::CLEARED: |
histogram_name = user_prefs::tracked::kTrackedPrefHistogramCleared; |
break; |
- case PrefHashStoreTransaction::SECURE_LEGACY: |
+ case ValueState::SECURE_LEGACY: |
histogram_name = |
user_prefs::tracked::kTrackedPrefHistogramMigratedLegacyDeviceId; |
break; |
- case PrefHashStoreTransaction::CHANGED: |
+ case ValueState::CHANGED: |
histogram_name = user_prefs::tracked::kTrackedPrefHistogramChanged; |
break; |
- case PrefHashStoreTransaction::UNTRUSTED_UNKNOWN_VALUE: |
+ case ValueState::UNTRUSTED_UNKNOWN_VALUE: |
histogram_name = user_prefs::tracked::kTrackedPrefHistogramInitialized; |
break; |
- case PrefHashStoreTransaction::TRUSTED_UNKNOWN_VALUE: |
+ case ValueState::TRUSTED_UNKNOWN_VALUE: |
histogram_name = |
user_prefs::tracked::kTrackedPrefHistogramTrustedInitialized; |
break; |
- case PrefHashStoreTransaction::TRUSTED_NULL_VALUE: |
+ case ValueState::TRUSTED_NULL_VALUE: |
histogram_name = |
user_prefs::tracked::kTrackedPrefHistogramNullInitialized; |
break; |
- case PrefHashStoreTransaction::UNSUPPORTED: |
+ case ValueState::UNSUPPORTED: |
NOTREACHED() << "ReportValidationResult should not be called with an " |
"UNSUPPORTED value state"; |
return; |