Pref service: integrate PersistentPrefStoreImpl with PrefStoreManagerImpl.

services/preferences/public/cpp/pref_store_manager_impl.cc

 // Copyright 2017 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 "services/preferences/public/cpp/pref_store_manager_impl.h"
 
+#include <utility>
+
 #include "base/memory/ref_counted.h"
+#include "base/threading/sequenced_worker_pool.h"
 #include "components/prefs/pref_value_store.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
+#include "services/preferences/persistent_pref_store_factory.h"
+#include "services/preferences/persistent_pref_store_impl.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 
 namespace prefs {
+namespace {
 
 using ConnectCallback = mojom::PrefStoreConnector::ConnectCallback;
 using PrefStorePtrs =
     std::unordered_map<PrefValueStore::PrefStoreType, mojom::PrefStorePtr>;
 
 // Used to make sure all pref stores have been registered before replying to any
 // Connect calls.
 class ConnectionBarrier : public base::RefCounted<ConnectionBarrier> {
  public:
   static void Create(const PrefStorePtrs& pref_store_ptrs,
@@ skipping 43 matching lines @@
     PrefValueStore::PrefStoreType type,
     mojom::PrefStoreConnectionPtr connection_ptr) {
   connections_.insert(std::make_pair(type, std::move(connection_ptr)));
   if (connections_.size() == expected_connections_) {
     // After this method exits |this| will get destroyed so it's safe to move
     // out the map.
     callback_.Run(std::move(connections_));
   }
 }
 
-PrefStoreManagerImpl::PrefStoreManagerImpl(PrefStoreTypes expected_pref_stores)
-    : expected_pref_stores_(std::move(expected_pref_stores)) {}
+}  // namespace
+
+PrefStoreManagerImpl::PrefStoreManagerImpl(
+    PrefStoreTypes expected_pref_stores,
+    scoped_refptr<base::SequencedWorkerPool> worker_pool)
+    : expected_pref_stores_(std::move(expected_pref_stores)),
+      init_binding_(this),
+      worker_pool_(std::move(worker_pool)) {}
 
 PrefStoreManagerImpl::~PrefStoreManagerImpl() = default;
 
 void PrefStoreManagerImpl::Register(PrefValueStore::PrefStoreType type,
                                     mojom::PrefStorePtr pref_store_ptr) {
   if (expected_pref_stores_.count(type) == 0) {
     LOG(WARNING) << "Not registering unexpected pref store: " << type;
     return;
   }
   DVLOG(1) << "Registering pref store: " << type;
@@ skipping 24 matching lines @@
     prefs::mojom::PrefStoreConnectorRequest request) {
   connector_bindings_.AddBinding(this, std::move(request));
 }
 
 void PrefStoreManagerImpl::Create(
     const service_manager::Identity& remote_identity,
     prefs::mojom::PrefStoreRegistryRequest request) {
   registry_bindings_.AddBinding(this, std::move(request));
 }
 
+void PrefStoreManagerImpl::Create(
+    const service_manager::Identity& remote_identity,
+    prefs::mojom::PersistentPrefStoreConnectorRequest request) {
+  if (!persistent_pref_store_) {
+    pending_persistent_pref_store_requests_.push_back(std::move(request));
+    return;
+  }
+  persistent_pref_store_bindings_.AddBinding(persistent_pref_store_.get(),
+                                             std::move(request));
+}
+
+void PrefStoreManagerImpl::Create(
+    const service_manager::Identity& remote_identity,
+    prefs::mojom::PrefServiceControlRequest request) {
+  if (init_binding_.is_bound())
+    return;

[tibell, 2017/03/10 04:20:24]

Is this an error condition we want to warn about?

[Sam McNally, 2017/03/10 05:06:56]

Done.

+
+  init_binding_.Bind(std::move(request));
+}
+
+void PrefStoreManagerImpl::Init(
+    mojom::PersistentPrefStoreConfigurationPtr configuration) {
+  DCHECK(!persistent_pref_store_);
+
+  persistent_pref_store_ =
+      CreatePersistentPrefStore(std::move(configuration), worker_pool_.get());
+  DCHECK(persistent_pref_store_);
+  for (auto& request : pending_persistent_pref_store_requests_) {
+    persistent_pref_store_bindings_.AddBinding(persistent_pref_store_.get(),
+                                               std::move(request));
+  }
+  pending_persistent_pref_store_requests_.clear();
+}
+
 void PrefStoreManagerImpl::OnStart() {}
 
 bool PrefStoreManagerImpl::OnConnect(
     const service_manager::ServiceInfo& remote_info,
     service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<prefs::mojom::PrefStoreConnector>(this);
   registry->AddInterface<prefs::mojom::PrefStoreRegistry>(this);
+  registry->AddInterface<prefs::mojom::PersistentPrefStoreConnector>(this);
+  registry->AddInterface<prefs::mojom::PrefServiceControl>(this);
   return true;
 }
 
 void PrefStoreManagerImpl::OnPrefStoreDisconnect(
     PrefValueStore::PrefStoreType type) {
   DVLOG(1) << "Deregistering pref store: " << type;
   pref_store_ptrs_.erase(type);
 }
 
 bool PrefStoreManagerImpl::AllConnected() const {
   return pref_store_ptrs_.size() == expected_pref_stores_.size();
 }
 
 }  // namespace prefs