Eliminate OnConnect usage

mojo/public/cpp/bindings/tests/versioning_test_service.cc

 // Copyright 2015 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 <stdint.h>
 
 #include <map>
 #include <utility>
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h"
 #include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_runner.h"
 
 namespace mojo {
 namespace test {
 namespace versioning {
 
 struct EmployeeInfo {
  public:
@@ skipping 67 matching lines @@
  private:
   std::map<uint64_t, EmployeeInfo*> employees_;
 
   StrongBinding<HumanResourceDatabase> strong_binding_;
 };
 
 class HumanResourceSystemServer
     : public service_manager::Service,
       public InterfaceFactory<HumanResourceDatabase> {
  public:
-  HumanResourceSystemServer() {}
+  HumanResourceSystemServer() {
+    registry_.AddInterface<HumanResourceDatabase>(this);
+  }
 
   // service_manager::Service implementation.
-  bool OnConnect(Connection* connection) override {
-    connection->AddInterface<HumanResourceDatabase>(this);
-    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));
   }
 
   // InterfaceFactory<HumanResourceDatabase> implementation.
   void Create(Connection* connection,
               InterfaceRequest<HumanResourceDatabase> request) override {
     // It will be deleted automatically when the underlying pipe encounters a
     // connection error.
     new HumanResourceDatabaseImpl(std::move(request));
   }
+
+ private:
+  service_manager::BinderRegistry registry_;
 };
 
 }  // namespace versioning
 }  // namespace test
 }  // namespace mojo
 
 MojoResult ServiceMain(MojoHandle request) {
   mojo::ServiceRunner runner(
       new mojo::test::versioning::HumanResourceSystemServer());
 
   return runner.Run(request);
 }