Index: services/preferences/public/cpp/tracked/mock_validation_delegate.h |
diff --git a/components/user_prefs/tracked/mock_validation_delegate.h b/services/preferences/public/cpp/tracked/mock_validation_delegate.h |
similarity index 58% |
rename from components/user_prefs/tracked/mock_validation_delegate.h |
rename to services/preferences/public/cpp/tracked/mock_validation_delegate.h |
index 58a35e821ade75e0fcf619b64dba3b3c2bb3c6c3..5538c69301fd5931237b525c0955b67ea8a19238 100644 |
--- a/components/user_prefs/tracked/mock_validation_delegate.h |
+++ b/services/preferences/public/cpp/tracked/mock_validation_delegate.h |
@@ -2,8 +2,8 @@ |
// 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_MOCK_VALIDATION_DELEGATE_H_ |
-#define COMPONENTS_USER_PREFS_TRACKED_MOCK_VALIDATION_DELEGATE_H_ |
+#ifndef SERVICES_PREFERENCES_PUBLIC_CPP_TRACKED_MOCK_VALIDATION_DELEGATE_H_ |
+#define SERVICES_PREFERENCES_PUBLIC_CPP_TRACKED_MOCK_VALIDATION_DELEGATE_H_ |
#include <stddef.h> |
@@ -12,8 +12,7 @@ |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "components/user_prefs/tracked/pref_hash_filter.h" |
-#include "components/user_prefs/tracked/pref_hash_store_transaction.h" |
+#include "services/preferences/public/interfaces/preferences_configuration.mojom.h" |
#include "services/preferences/public/interfaces/tracked_preference_validation_delegate.mojom.h" |
class MockValidationDelegate; |
@@ -25,10 +24,12 @@ class MockValidationDelegateRecord |
struct ValidationEvent { |
ValidationEvent( |
const std::string& path, |
- PrefHashStoreTransaction::ValueState state, |
- PrefHashStoreTransaction::ValueState external_validation_state, |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState state, |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState |
+ external_validation_state, |
bool is_personal, |
- PrefHashFilter::PrefTrackingStrategy tracking_strategy) |
+ prefs::mojom::TrackedPreferenceMetadata::PrefTrackingStrategy |
+ tracking_strategy) |
: pref_path(path), |
value_state(state), |
external_validation_value_state(external_validation_state), |
@@ -36,10 +37,11 @@ class MockValidationDelegateRecord |
strategy(tracking_strategy) {} |
std::string pref_path; |
- PrefHashStoreTransaction::ValueState value_state; |
- PrefHashStoreTransaction::ValueState external_validation_value_state; |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState value_state; |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState |
+ external_validation_value_state; |
bool is_personal; |
- PrefHashFilter::PrefTrackingStrategy strategy; |
+ prefs::mojom::TrackedPreferenceMetadata::PrefTrackingStrategy strategy; |
}; |
MockValidationDelegateRecord(); |
@@ -49,11 +51,13 @@ class MockValidationDelegateRecord |
// Returns the number of validations of a given value state. |
size_t CountValidationsOfState( |
- PrefHashStoreTransaction::ValueState value_state) const; |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState value_state) |
+ const; |
// Returns the number of external validations of a given value state. |
size_t CountExternalValidationsOfState( |
- PrefHashStoreTransaction::ValueState value_state) const; |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState value_state) |
+ const; |
// Returns the event for the preference with a given path. |
const ValidationEvent* GetEventForPath(const std::string& pref_path) const; |
@@ -67,10 +71,11 @@ class MockValidationDelegateRecord |
// Adds a new validation event. |
void RecordValidation( |
const std::string& pref_path, |
- PrefHashStoreTransaction::ValueState value_state, |
- PrefHashStoreTransaction::ValueState external_validation_value_state, |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState value_state, |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState |
+ external_validation_value_state, |
bool is_personal, |
- PrefHashFilter::PrefTrackingStrategy strategy); |
+ prefs::mojom::TrackedPreferenceMetadata::PrefTrackingStrategy strategy); |
std::vector<ValidationEvent> validations_; |
@@ -88,29 +93,32 @@ class MockValidationDelegate |
void OnAtomicPreferenceValidation( |
const std::string& pref_path, |
std::unique_ptr<base::Value> value, |
- PrefHashStoreTransaction::ValueState value_state, |
- PrefHashStoreTransaction::ValueState external_validation_value_state, |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState value_state, |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState |
+ external_validation_value_state, |
bool is_personal) override; |
void OnSplitPreferenceValidation( |
const std::string& pref_path, |
const std::vector<std::string>& invalid_keys, |
const std::vector<std::string>& external_validation_invalid_keys, |
- PrefHashStoreTransaction::ValueState value_state, |
- PrefHashStoreTransaction::ValueState external_validation_value_state, |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState value_state, |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState |
+ external_validation_value_state, |
bool is_personal) override; |
private: |
// Adds a new validation event. |
void RecordValidation( |
const std::string& pref_path, |
- PrefHashStoreTransaction::ValueState value_state, |
- PrefHashStoreTransaction::ValueState external_validation_value_state, |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState value_state, |
+ prefs::mojom::TrackedPreferenceValidationDelegate::ValueState |
+ external_validation_value_state, |
bool is_personal, |
- PrefHashFilter::PrefTrackingStrategy strategy); |
+ prefs::mojom::TrackedPreferenceMetadata::PrefTrackingStrategy strategy); |
scoped_refptr<MockValidationDelegateRecord> record_; |
DISALLOW_COPY_AND_ASSIGN(MockValidationDelegate); |
}; |
-#endif // COMPONENTS_USER_PREFS_TRACKED_MOCK_VALIDATION_DELEGATE_H_ |
+#endif // SERVICES_PREFERENCES_PUBLIC_CPP_TRACKED_MOCK_VALIDATION_DELEGATE_H_ |