Replace ServiceInfo with BindSourceInfo.

services/service_manager/public/cpp/lib/service_context.cc

 // Copyright 2014 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/service_manager/public/cpp/service_context.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 55 matching lines @@
     binding_.Close();
   if (!quit_closure_.is_null()) {
     // CAUTION: May delete |this|.
     base::ResetAndReturn(&quit_closure_).Run();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceContext, mojom::Service implementation:
 
-void ServiceContext::OnStart(const ServiceInfo& info,
+void ServiceContext::OnStart(const Identity& identity,
                              const OnStartCallback& callback) {
-  local_info_ = info;
+  identity_ = identity;
   callback.Run(std::move(pending_connector_request_),
                mojo::MakeRequest(&service_control_));
   service_->OnStart();
 }
 
 void ServiceContext::OnBindInterface(
-    const ServiceInfo& source_info,
+    const BindSourceInfo& source_info,
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle interface_pipe,
     const OnBindInterfaceCallback& callback) {
   // Acknowledge the request regardless of whether it's accepted.
   callback.Run();
 
   service_->OnBindInterface(source_info, interface_name,
                             std::move(interface_pipe));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceContext, private:
 
 void ServiceContext::OnConnectionError() {
   if (service_->OnServiceManagerConnectionLost()) {
     // CAUTION: May delete |this|.
     QuitNow();
   }
 }
 
 }  // namespace service_manager