Eliminate OnConnect usage

services/device/device_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 SERVICES_DEVICE_DEVICE_SERVICE_H_
 #define SERVICES_DEVICE_DEVICE_SERVICE_H_
 
 #include "base/memory/ref_counted.h"
 #include "device/battery/battery_monitor.mojom.h"
 #include "device/screen_orientation/public/interfaces/screen_orientation.mojom.h"
 #include "device/sensors/public/interfaces/light.mojom.h"
 #include "device/sensors/public/interfaces/motion.mojom.h"
 #include "device/sensors/public/interfaces/orientation.mojom.h"
 #include "device/vibration/vibration_manager.mojom.h"
 #include "device/wake_lock/public/interfaces/wake_lock_context_provider.mojom.h"
 #include "device/wake_lock/wake_lock_service_context.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/device/public/interfaces/fingerprint.mojom.h"
 #include "services/device/public/interfaces/power_monitor.mojom.h"
 #include "services/device/public/interfaces/time_zone_monitor.mojom.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/interface_provider.h"
 #include "services/service_manager/public/cpp/service.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace device {
 
@@ skipping 37 matching lines @@
                 const WakeLockContextCallback& wake_lock_context_callback);
 #else
   DeviceService(scoped_refptr<base::SingleThreadTaskRunner> file_task_runner,
                 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner);
 #endif
   ~DeviceService() 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& source_info,
+                       const std::string& interface_name,
+                       mojo::ScopedMessagePipeHandle interface_pipe) override;
 
   // InterfaceFactory<mojom::Fingerprint>:
   void Create(const service_manager::Identity& remote_identity,
               mojom::FingerprintRequest request) override;
 
   // InterfaceFactory<mojom::LightSensor>:
   void Create(const service_manager::Identity& remote_identity,
               mojom::LightSensorRequest request) override;
 
   // InterfaceFactory<mojom::MotionSensor>:
@@ skipping 45 matching lines @@
   service_manager::InterfaceProvider java_interface_provider_;
 
   bool java_interface_provider_initialized_;
 #endif
 
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
 
   WakeLockContextCallback wake_lock_context_callback_;
 
+  service_manager::BinderRegistry registry_;
+
   DISALLOW_COPY_AND_ASSIGN(DeviceService);
 };
 
 }  // namespace device
 
 #endif  // SERVICES_DEVICE_DEVICE_SERVICE_H_