Pref service: Merge connectors and send a PrefRegistry in Connect().

components/sync_preferences/pref_service_syncable_factory.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync_preferences/pref_service_syncable_factory.h"
 
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/default_pref_store.h"
 #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/persistent_pref_store_client.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"
 #include "components/policy/core/browser/configuration_policy_pref_store.h"
 #include "components/policy/core/common/policy_service.h"  // nogncheck
 #include "components/policy/core/common/policy_types.h"    // nogncheck
 #endif
@@ skipping 52 matching lines @@
 }
 
 }  // namespace
 
 std::unique_ptr<PrefServiceSyncable> PrefServiceSyncableFactory::CreateSyncable(
     user_prefs::PrefRegistrySyncable* pref_registry,
     service_manager::Connector* connector) {
   TRACE_EVENT0("browser", "PrefServiceSyncableFactory::CreateSyncable");
   PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
 
+  if (!user_prefs_) {
+    prefs::mojom::PrefStoreConnectorPtr pref_connector;
+    connector->BindInterface(prefs::mojom::kPrefStoreServiceName,
+                             &pref_connector);
+    user_prefs_ = new prefs::PersistentPrefStoreClient(
+        std::move(pref_connector), make_scoped_refptr(pref_registry));
+  }
+
   // Expose all read-only stores through the prefs service.
   auto managed = CreateRegisteredPrefStore(connector, managed_prefs_,
                                            PrefValueStore::MANAGED_STORE);
   auto supervised = CreateRegisteredPrefStore(
       connector, supervised_user_prefs_, PrefValueStore::SUPERVISED_USER_STORE);
   auto extension = CreateRegisteredPrefStore(connector, extension_prefs_,
                                              PrefValueStore::EXTENSION_STORE);
   auto command_line = CreateRegisteredPrefStore(
       connector, command_line_prefs_, PrefValueStore::COMMAND_LINE_STORE);
   auto recommended = CreateRegisteredPrefStore(
       connector, recommended_prefs_, PrefValueStore::RECOMMENDED_STORE);
 
   // TODO(sammc): Register Mojo user pref store once implemented.
   std::unique_ptr<PrefServiceSyncable> pref_service(new PrefServiceSyncable(
       pref_notifier,
       new PrefValueStore(managed.get(), supervised.get(), extension.get(),
                          command_line.get(), user_prefs_.get(),
                          recommended.get(), pref_registry->defaults().get(),
                          pref_notifier),
       user_prefs_.get(), pref_registry, pref_model_associator_client_,
       read_error_callback_, async_));
   return pref_service;
 }
 
 }  // namespace sync_preferences