| Index: chrome/browser/prefs/profile_pref_store_manager.h
|
| diff --git a/chrome/browser/prefs/profile_pref_store_manager.h b/chrome/browser/prefs/profile_pref_store_manager.h
|
| index c79ef0b012208d333caecad642f4c34eccb0803e..b7659953da693ccf8ba87d7e5baa6d74ab10e5a3 100644
|
| --- a/chrome/browser/prefs/profile_pref_store_manager.h
|
| +++ b/chrome/browser/prefs/profile_pref_store_manager.h
|
| @@ -15,6 +15,8 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "components/user_prefs/tracked/pref_hash_filter.h"
|
| +#include "services/preferences/public/interfaces/preferences.mojom.h"
|
| +#include "services/preferences/public/interfaces/tracked_preference_validation_delegate.mojom.h"
|
|
|
| class HashStoreContents;
|
| class PersistentPrefStore;
|
| @@ -24,6 +26,7 @@ class PrefService;
|
| namespace base {
|
| class DictionaryValue;
|
| class SequencedTaskRunner;
|
| +class SingleThreadTaskRunner;
|
| } // namespace base
|
|
|
| namespace prefs {
|
| @@ -32,6 +35,10 @@ class TrackedPreferenceValidationDelegate;
|
| }
|
| }
|
|
|
| +namespace service_manager {
|
| +class Connector;
|
| +}
|
| +
|
| namespace user_prefs {
|
| class PrefRegistrySyncable;
|
| } // namespace user_prefs
|
| @@ -89,9 +96,12 @@ class ProfilePrefStoreManager {
|
| // An optional |validation_delegate| will be notified
|
| // of the status of each tracked preference as they are checked.
|
| PersistentPrefStore* CreateProfilePrefStore(
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& pref_task_runner,
|
| const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
|
| const base::Closure& on_reset_on_load,
|
| - prefs::mojom::TrackedPreferenceValidationDelegate* validation_delegate);
|
| + std::unique_ptr<prefs::mojom::TrackedPreferenceValidationDelegate>*
|
| + validation_delegate,
|
| + service_manager::Connector* connector);
|
|
|
| // Initializes the preferences for the managed profile with the preference
|
| // values in |master_prefs|. Acts synchronously, including blocking IO.
|
| @@ -118,6 +128,13 @@ class ProfilePrefStoreManager {
|
| std::pair<std::unique_ptr<PrefHashStore>, std::unique_ptr<HashStoreContents>>
|
| GetExternalVerificationPrefHashStorePair();
|
|
|
| + // Connects to the pref service over mojo and configures it.
|
| + void ConfigurePrefServiceUserPrefs(
|
| + const base::Closure& on_reset_on_load,
|
| + std::unique_ptr<prefs::mojom::TrackedPreferenceValidationDelegate>
|
| + validation_delegate,
|
| + service_manager::Connector* connector);
|
| +
|
| const base::FilePath profile_path_;
|
| const std::vector<PrefHashFilter::TrackedPreferenceMetadata>
|
| tracking_configuration_;
|
|
|