Replace ServiceInfo with BindSourceInfo.

services/service_manager/tests/lifecycle/package.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 <algorithm>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 24 matching lines @@
     bindings_.set_connection_error_handler(base::Bind(&PackagedApp::BindingLost,
                                                       base::Unretained(this)));
     registry_.AddInterface<service_manager::test::mojom::LifecycleControl>(
         this);
   }
 
   ~PackagedApp() override {}
 
  private:
   // service_manager::Service:
-  void OnBindInterface(const service_manager::ServiceInfo& source_info,
+  void OnBindInterface(const service_manager::BindSourceInfo& source_info,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override {
     registry_.BindInterface(source_info.identity, interface_name,
                             std::move(interface_pipe));
   }
 
   // service_manager::InterfaceFactory<LifecycleControl>
   void Create(
       const service_manager::Identity& remote_identity,
       service_manager::test::mojom::LifecycleControlRequest request) override {
@@ skipping 49 matching lines @@
                     service_manager::mojom::ServiceFactory>,
                 public service_manager::mojom::ServiceFactory {
  public:
   Package() : ForwardingService(&app_client_) {
     registry_.AddInterface<service_manager::mojom::ServiceFactory>(this);
   }
   ~Package() override {}
 
  private:
   // ForwardingService:
-  void OnBindInterface(const service_manager::ServiceInfo& source_info,
+  void OnBindInterface(const service_manager::BindSourceInfo& source_info,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override {
     if (registry_.CanBindInterface(interface_name)) {
       registry_.BindInterface(source_info.identity, interface_name,
                               std::move(interface_pipe));
     } else {
       ForwardingService::OnBindInterface(source_info, interface_name,
                                          std::move(interface_pipe));
     }
   }
@@ skipping 54 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(Package);
 };
 
 }  // namespace
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(new Package);
   return runner.Run(service_request_handle);
 }