Eliminate OnConnect usage

services/device/device_service.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/device/device_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 65 matching lines @@
     : file_task_runner_(std::move(file_task_runner)),
       io_task_runner_(std::move(io_task_runner)) {}
 #endif
 
 DeviceService::~DeviceService() {
 #if !defined(OS_ANDROID)
   device::BatteryStatusService::GetInstance()->Shutdown();
 #endif
 }
 
-void DeviceService::OnStart() {}
-
-bool DeviceService::OnConnect(const service_manager::ServiceInfo& remote_info,
-                              service_manager::InterfaceRegistry* registry) {
-  registry->AddInterface<mojom::Fingerprint>(this);
-  registry->AddInterface<mojom::LightSensor>(this);
-  registry->AddInterface<mojom::MotionSensor>(this);
-  registry->AddInterface<mojom::OrientationSensor>(this);
-  registry->AddInterface<mojom::OrientationAbsoluteSensor>(this);
-  registry->AddInterface<mojom::PowerMonitor>(this);
-  registry->AddInterface<mojom::ScreenOrientationListener>(this);
-  registry->AddInterface<mojom::TimeZoneMonitor>(this);
-  registry->AddInterface<mojom::WakeLockContextProvider>(this);
+void DeviceService::OnStart() {
+  registry_.AddInterface<mojom::Fingerprint>(this);
+  registry_.AddInterface<mojom::LightSensor>(this);
+  registry_.AddInterface<mojom::MotionSensor>(this);
+  registry_.AddInterface<mojom::OrientationSensor>(this);
+  registry_.AddInterface<mojom::OrientationAbsoluteSensor>(this);
+  registry_.AddInterface<mojom::PowerMonitor>(this);
+  registry_.AddInterface<mojom::ScreenOrientationListener>(this);
+  registry_.AddInterface<mojom::TimeZoneMonitor>(this);
+  registry_.AddInterface<mojom::WakeLockContextProvider>(this);
 
 #if defined(OS_ANDROID)
-  registry->AddInterface(
+  registry_.AddInterface(
       GetJavaInterfaceProvider()->CreateInterfaceFactory<BatteryMonitor>());
-  registry->AddInterface(
+  registry_.AddInterface(
       GetJavaInterfaceProvider()
           ->CreateInterfaceFactory<mojom::VibrationManager>());
 #else
-  registry->AddInterface<BatteryMonitor>(this);
-  registry->AddInterface<mojom::VibrationManager>(this);
+  registry_.AddInterface<BatteryMonitor>(this);
+  registry_.AddInterface<mojom::VibrationManager>(this);
 #endif
+}
 
-  return true;
+void DeviceService::OnBindInterface(
+    const service_manager::ServiceInfo& source_info,
+    const std::string& interface_name,
+    mojo::ScopedMessagePipeHandle interface_pipe) {
+  registry_.BindInterface(source_info.identity, interface_name,
+                          std::move(interface_pipe));
 }
 
 #if !defined(OS_ANDROID)
 void DeviceService::Create(const service_manager::Identity& remote_identity,
                            BatteryMonitorRequest request) {
   device::BatteryMonitorImpl::Create(std::move(request));
 }
 
 void DeviceService::Create(const service_manager::Identity& remote_identity,
                            mojom::VibrationManagerRequest request) {
@@ skipping 116 matching lines @@
     java_interface_provider_.Bind(std::move(provider));
 
     java_interface_provider_initialized_ = true;
   }
 
   return &java_interface_provider_;
 }
 #endif
 
 }  // namespace device