Eliminate OnConnect usage

services/catalog/catalog.cc

 // Copyright 2016 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/catalog/catalog.h"
 
 #include <memory>
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/filesystem/directory_impl.h"
 #include "components/filesystem/lock_table.h"
 #include "components/filesystem/public/interfaces/types.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/catalog/constants.h"
 #include "services/catalog/entry_cache.h"
 #include "services/catalog/instance.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/connection.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service_context.h"
 
 namespace catalog {
 
 namespace {
 
 const char kCatalogServicesKey[] = "services";
 const char kCatalogServiceEmbeddedKey[] = "embedded";
 const char kCatalogServiceExecutableKey[] = "executable";
 const char kCatalogServiceManifestKey[] = "manifest";
@@ skipping 66 matching lines @@
     } else {
       LOG(ERROR) << "Failed to read manifest entry for \"" << it.key() << "\".";
     }
   }
 }
 
 }  // namespace
 
 class Catalog::ServiceImpl : public service_manager::Service {
  public:
-  explicit ServiceImpl(Catalog* catalog) : catalog_(catalog) {}
+  explicit ServiceImpl(Catalog* catalog) : catalog_(catalog) {
+    registry_.AddInterface<mojom::Catalog>(catalog_);
+    registry_.AddInterface<filesystem::mojom::Directory>(catalog_);
+    registry_.AddInterface<service_manager::mojom::Resolver>(catalog_);
+  }
   ~ServiceImpl() override {}
 
   // service_manager::Service:
-  bool OnConnect(const service_manager::ServiceInfo& remote_info,
-                 service_manager::InterfaceRegistry* registry) override {
-    registry->AddInterface<mojom::Catalog>(catalog_);
-    registry->AddInterface<filesystem::mojom::Directory>(catalog_);
-    registry->AddInterface<service_manager::mojom::Resolver>(catalog_);
-    return true;
+  void OnBindInterface(const service_manager::ServiceInfo& source_info,
+                       const std::string& interface_name,
+                       mojo::ScopedMessagePipeHandle interface_pipe) override {
+    registry_.BindInterface(source_info.identity, interface_name,
+                            std::move(interface_pipe));
   }
 
  private:
   Catalog* const catalog_;
+  service_manager::BinderRegistry registry_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceImpl);
 };
 
 Catalog::Catalog(std::unique_ptr<base::Value> static_manifest,
                  ManifestProvider* service_manifest_provider)
     : service_context_(new service_manager::ServiceContext(
           base::MakeUnique<ServiceImpl>(this),
           service_manager::mojom::ServiceRequest(&service_))),
       service_manifest_provider_(service_manifest_provider),
@@ skipping 63 matching lines @@
   if (it != instances_.end())
     return it->second.get();
 
   auto result = instances_.insert(std::make_pair(
       user_id,
       base::MakeUnique<Instance>(&system_cache_, service_manifest_provider_)));
   return result.first->second.get();
 }
 
 }  // namespace catalog