Eliminate OnConnect usage

mash/package/mash_packaged_service.h

 // 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.
 
 #ifndef MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_
 #define MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_
 
 #include <memory>
 
 #include "mojo/public/cpp/bindings/binding_set.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/interfaces/service_factory.mojom.h"
 
 namespace service_manager {
 class ServiceContext;
 }
 
 namespace mash {
 
@@ skipping 13 matching lines @@
 //   - Add an entry for the new service in MashPackagedService::CreateService().
 class MashPackagedService : public service_manager::Service,
                             public service_manager::mojom::ServiceFactory,
                             public service_manager::InterfaceFactory<
                                 service_manager::mojom::ServiceFactory> {
  public:
   MashPackagedService();
   ~MashPackagedService() override;
 
   // service_manager::Service:
-  bool OnConnect(const service_manager::ServiceInfo& remote_info,
-                 service_manager::InterfaceRegistry* registry) override;
+  void OnBindInterface(const service_manager::ServiceInfo& source_info,
+                       const std::string& interface_name,
+                       mojo::ScopedMessagePipeHandle interface_pipe) override;
 
   // service_manager::InterfaceFactory<ServiceFactory>
   void Create(const service_manager::Identity& remote_identity,
               mojo::InterfaceRequest<ServiceFactory> request) override;
 
   // ServiceFactory:
   void CreateService(service_manager::mojom::ServiceRequest request,
                      const std::string& mojo_name) override;
 
  private:
   std::unique_ptr<service_manager::Service> CreateService(
       const std::string& name);
 
   std::unique_ptr<service_manager::ServiceContext> context_;
+  service_manager::BinderRegistry registry_;
   mojo::BindingSet<ServiceFactory> service_factory_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(MashPackagedService);
 };
 
 }  // namespace mash
 
 #endif  // MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_