Eliminate OnConnect usage

ash/autoclick/mus/autoclick_application.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 ASH_AUTOCLICK_MUS_AUTOCLICK_APPLICATION_H_
 #define ASH_AUTOCLICK_MUS_AUTOCLICK_APPLICATION_H_
 
 #include <map>
 
 #include "ash/autoclick/common/autoclick_controller_common.h"
 #include "ash/autoclick/common/autoclick_controller_common_delegate.h"
 #include "ash/autoclick/mus/public/interfaces/autoclick.mojom.h"
 #include "base/macros.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/identity.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 
 namespace views {
 class AuraInit;
 class Widget;
 }
 
 namespace ash {
 namespace autoclick {
 
 class AutoclickApplication
     : public service_manager::Service,
       public mash::mojom::Launchable,
       public mojom::AutoclickController,
       public service_manager::InterfaceFactory<mash::mojom::Launchable>,
       public service_manager::InterfaceFactory<mojom::AutoclickController>,
       public AutoclickControllerCommonDelegate {
  public:
   AutoclickApplication();
   ~AutoclickApplication() override;
 
  private:
   // service_manager::Service:
   void OnStart() override;
-  bool OnConnect(const service_manager::ServiceInfo& remote_info,
-                 service_manager::InterfaceRegistry* registry) override;
+  void OnBindInterface(const service_manager::ServiceInfo& remote_info,
+                       const std::string& interface_name,
+                       mojo::ScopedMessagePipeHandle interface_pipe) override;
 
   // mojom::Launchable:
   void Launch(uint32_t what, mash::mojom::LaunchMode how) override;
 
   // mojom::AutoclickController:
   void SetAutoclickDelay(uint32_t delay_in_milliseconds) override;
 
   // service_manager::InterfaceFactory<mojom::Launchable>:
   void Create(const service_manager::Identity& remote_identity,
               mash::mojom::LaunchableRequest request) override;
 
   // service_manager::InterfaceFactory<mojom::AutoclickController>:
   void Create(const service_manager::Identity& remote_identity,
               mojom::AutoclickControllerRequest request) override;
 
   // AutoclickControllerCommonDelegate:
   views::Widget* CreateAutoclickRingWidget(
       const gfx::Point& event_location) override;
   void UpdateAutoclickRingWidget(views::Widget* widget,
                                  const gfx::Point& event_location) override;
   void DoAutoclick(const gfx::Point& event_location,
                    const int mouse_event_flags) override;
   void OnAutoclickCanceled() override;
 
+  service_manager::BinderRegistry registry_;
   mojo::Binding<mash::mojom::Launchable> launchable_binding_;
   mojo::Binding<mojom::AutoclickController> autoclick_binding_;
 
   std::unique_ptr<views::AuraInit> aura_init_;
   std::unique_ptr<AutoclickControllerCommon> autoclick_controller_common_;
   std::unique_ptr<views::Widget> widget_;
 
   DISALLOW_COPY_AND_ASSIGN(AutoclickApplication);
 };
 
 }  // namespace autoclick
 }  // namespace ash
 
 #endif  // ASH_AUTOCLICK_MUS_AUTOCLICK_APPLICATION_H_