Replace ServiceInfo with BindSourceInfo.

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/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "device/battery/battery_monitor.mojom.h"
 #include "device/battery/battery_monitor_impl.h"
 #include "device/battery/battery_status_service.h"
 #include "device/generic_sensor/sensor_provider_impl.h"
 #include "device/sensors/device_sensor_host.h"
 #include "device/wake_lock/wake_lock_context_provider.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "services/device/fingerprint/fingerprint.h"
 #include "services/device/power_monitor/power_monitor_message_broadcaster.h"
 #include "services/device/public/cpp/device_features.h"
 #include "services/device/time_zone_monitor/time_zone_monitor.h"
-#include "services/service_manager/public/cpp/service_info.h"
+#include "services/service_manager/public/cpp/bind_source_info.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "jni/InterfaceRegistrar_jni.h"
 #include "services/device/android/register_jni.h"
 #include "services/device/screen_orientation/screen_orientation_listener_android.h"
 #else
 #include "services/device/vibration/vibration_manager_impl.h"
@@ skipping 66 matching lines @@
   registry_.AddInterface(
       GetJavaInterfaceProvider()
           ->CreateInterfaceFactory<mojom::VibrationManager>());
 #else
   registry_.AddInterface<mojom::BatteryMonitor>(this);
   registry_.AddInterface<mojom::VibrationManager>(this);
 #endif
 }
 
 void DeviceService::OnBindInterface(
-    const service_manager::ServiceInfo& source_info,
+    const service_manager::BindSourceInfo& 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,
                            mojom::BatteryMonitorRequest request) {
   BatteryMonitorImpl::Create(std::move(request));
@@ skipping 113 matching lines @@
     java_interface_provider_.Bind(std::move(provider));
 
     java_interface_provider_initialized_ = true;
   }
 
   return &java_interface_provider_;
 }
 #endif
 
 }  // namespace device