| Index: components/sync_preferences/pref_service_syncable_factory.cc
|
| diff --git a/components/sync_preferences/pref_service_syncable_factory.cc b/components/sync_preferences/pref_service_syncable_factory.cc
|
| index 2d314f51952cde9f54c97017448e7d945acd0e52..a7ecfe5cf1111699d19604c67cc17ba55e26f9fd 100644
|
| --- a/components/sync_preferences/pref_service_syncable_factory.cc
|
| +++ b/components/sync_preferences/pref_service_syncable_factory.cc
|
| @@ -11,6 +11,9 @@
|
| #include "components/prefs/pref_notifier_impl.h"
|
| #include "components/prefs/pref_value_store.h"
|
| #include "components/sync_preferences/pref_service_syncable.h"
|
| +#include "services/preferences/public/cpp/pref_store_adapter.h"
|
| +#include "services/preferences/public/interfaces/preferences.mojom.h"
|
| +#include "services/service_manager/public/cpp/connector.h"
|
|
|
| #if !defined(OS_IOS)
|
| #include "components/policy/core/browser/browser_policy_connector.h"
|
| @@ -52,13 +55,39 @@ void PrefServiceSyncableFactory::SetPrefModelAssociatorClient(
|
| pref_model_associator_client_ = pref_model_associator_client;
|
| }
|
|
|
| +namespace {
|
| +
|
| +scoped_refptr<::PrefStore> CreateRegisteredPrefStore(
|
| + service_manager::Connector* connector,
|
| + scoped_refptr<::PrefStore> backing_pref_store,
|
| + PrefValueStore::PrefStoreType type) {
|
| + prefs::mojom::PrefStoreRegistryPtr registry_ptr;
|
| + connector->BindInterface(prefs::mojom::kPrefStoreServiceName, ®istry_ptr);
|
| + CHECK(!registry_ptr.encountered_error());
|
| + registry_ptr.set_connection_error_handler(base::Bind([]() {
|
| + LOG(INFO) << "registry_ptr connection error!";
|
| + }));
|
| + return make_scoped_refptr(new prefs::PrefStoreAdapter(
|
| + backing_pref_store,
|
| + prefs::PrefStoreImpl::Create(std::move(registry_ptr), backing_pref_store,
|
| + type)));
|
| +}
|
| +
|
| +} // namespace
|
| +
|
| std::unique_ptr<PrefServiceSyncable> PrefServiceSyncableFactory::CreateSyncable(
|
| - user_prefs::PrefRegistrySyncable* pref_registry) {
|
| + user_prefs::PrefRegistrySyncable* pref_registry,
|
| + service_manager::Connector* connector) {
|
| TRACE_EVENT0("browser", "PrefServiceSyncableFactory::CreateSyncable");
|
| PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
|
| +
|
| + auto managed = CreateRegisteredPrefStore(connector, managed_prefs_.get(),
|
| + PrefValueStore::MANAGED_STORE);
|
| + // auto extension = CreateRegisteredPrefStore(connector, extension_prefs_.get(),
|
| + // PrefValueStore::EXTENSION_STORE);
|
| std::unique_ptr<PrefServiceSyncable> pref_service(new PrefServiceSyncable(
|
| pref_notifier,
|
| - new PrefValueStore(managed_prefs_.get(), supervised_user_prefs_.get(),
|
| + new PrefValueStore(managed.get(), supervised_user_prefs_.get(),
|
| extension_prefs_.get(), command_line_prefs_.get(),
|
| user_prefs_.get(), recommended_prefs_.get(),
|
| pref_registry->defaults().get(), pref_notifier),
|
|
|