Replace ServiceInfo with BindSourceInfo.

services/tracing/service.cc

 // Copyright 2015 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/tracing/service.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/system/wait.h"
-#include "services/service_manager/public/cpp/service_info.h"
+#include "services/service_manager/public/cpp/bind_source_info.h"
 
 namespace tracing {
 
 Service::Service() : collector_binding_(this), tracing_active_(false) {
   registry_.AddInterface<mojom::Factory>(this);
   registry_.AddInterface<mojom::Collector>(this);
   registry_.AddInterface<mojom::StartupPerformanceDataCollector>(this);
 }
 Service::~Service() {}
 
-void Service::OnBindInterface(const service_manager::ServiceInfo& source_info,
-                              const std::string& interface_name,
-                              mojo::ScopedMessagePipeHandle interface_pipe) {
+void Service::OnBindInterface(
+    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));
 }
 
 bool Service::OnServiceManagerConnectionLost() {
   // TODO(beng): This is only required because Service isn't run by
   // ServiceRunner - instead it's launched automatically by the standalone
   // service manager. It shouldn't be.
   base::MessageLoop::current()->QuitWhenIdle();
   return false;
@@ skipping 140 matching lines @@
     const GetStartupPerformanceTimesCallback& callback) {
   callback.Run(startup_performance_times_.Clone());
 }
 
 void Service::AllDataCollected() {
   recorder_impls_.clear();
   sink_.reset();
 }
 
 }  // namespace tracing