Eliminate OnConnect usage

services/preferences/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/pref_store_manager_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/prefs/default_pref_store.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/preferences/public/cpp/pref_store_impl.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/service_info.h"
 
 namespace prefs {
 namespace {
 
 using ConnectCallback = mojom::PrefStoreConnector::ConnectCallback;
 using PrefStorePtrs =
     std::unordered_map<PrefValueStore::PrefStoreType, mojom::PrefStore*>;
 
 // Used to make sure all pref stores have been registered before replying to any
 // Connect calls.
@@ skipping 87 matching lines @@
           mojo::MakeRequest(&pref_store_ptrs_[PrefValueStore::DEFAULT_STORE]))),
       worker_pool_(std::move(worker_pool)) {
   DCHECK(
       base::ContainsValue(expected_pref_stores_, PrefValueStore::USER_STORE) &&
       base::ContainsValue(expected_pref_stores_, PrefValueStore::DEFAULT_STORE))
       << "expected_pref_stores must always include PrefValueStore::USER_STORE "
          "and PrefValueStore::DEFAULT_STORE.";
   // The user store is not actually connected to in the implementation, but
   // accessed directly.
   expected_pref_stores_.erase(PrefValueStore::USER_STORE);
+  registry_.AddInterface<prefs::mojom::PrefStoreConnector>(this);
+  registry_.AddInterface<prefs::mojom::PrefStoreRegistry>(this);
+  registry_.AddInterface<prefs::mojom::PrefServiceControl>(this);
 }
 
 PrefStoreManagerImpl::~PrefStoreManagerImpl() = default;
 
 struct PrefStoreManagerImpl::PendingConnect {
   mojom::PrefRegistryPtr pref_registry;
   // Pref stores the caller already is connected to (and hence we won't
   // connect to these).
   std::vector<PrefValueStore::PrefStoreType> already_connected_types;
   ConnectCallback callback;
@@ skipping 64 matching lines @@
       std::move(configuration), worker_pool_.get(),
       base::Bind(&PrefStoreManagerImpl::OnPersistentPrefStoreReady,
                  base::Unretained(this)));
   DCHECK(persistent_pref_store_);
   if (AllConnected())
     ProcessPendingConnects();
 }
 
 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::PrefServiceControl>(this);
-  return true;
+void PrefStoreManagerImpl::OnBindInterface(
+    const service_manager::ServiceInfo& source_info,
+    const std::string& interface_name,
+    mojo::ScopedMessagePipeHandle interface_pipe) {
+  registry_.BindInterface(source_info.identity, interface_name,
+                          std::move(interface_pipe));
 }
 
 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() &&
@@ skipping 41 matching lines @@
 }
 
 void PrefStoreManagerImpl::OnPersistentPrefStoreReady() {
   DVLOG(1) << "PersistentPrefStore ready";
   if (AllConnected()) {
     ProcessPendingConnects();
   }
 }
 
 }  // namespace prefs