Replace ServiceInfo with BindSourceInfo.

services/service_manager/tests/connect/connect_test_app.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 <memory>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 54 matching lines @@
         base::Bind(&ConnectTestApp::OnConnectionError,
                    base::Unretained(this)));
     standalone_bindings_.set_connection_error_handler(
         base::Bind(&ConnectTestApp::OnConnectionError,
                    base::Unretained(this)));
     registry_.AddInterface<test::mojom::ConnectTestService>(this);
     registry_.AddInterface<test::mojom::StandaloneApp>(this);
     registry_.AddInterface<test::mojom::BlockedInterface>(this);
     registry_.AddInterface<test::mojom::UserIdTest>(this);
   }
-  void OnBindInterface(const ServiceInfo& source_info,
+  void OnBindInterface(const BindSourceInfo& source_info,
                        const std::string& interface_name,
                        mojo::ScopedMessagePipeHandle interface_pipe) override {
     registry_.BindInterface(source_info.identity, interface_name,
                             std::move(interface_pipe));
   }
 
   // InterfaceFactory<test::mojom::ConnectTestService>:
   void Create(const Identity& remote_identity,
               test::mojom::ConnectTestServiceRequest request) override {
     bindings_.AddBinding(this, std::move(request));
@@ skipping 132 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ConnectTestApp);
 };
 
 }  // namespace service_manager
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(new service_manager::ConnectTestApp);
   return runner.Run(service_request_handle);
 }