Change Service contract to pass ServiceInfo instead of Identity

services/service_manager/tests/shutdown/shutdown_client_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 "base/macros.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/c/main.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_runner.h"
 #include "services/service_manager/tests/shutdown/shutdown_unittest.mojom.h"
 
 namespace service_manager {
 
 class ShutdownClientApp
     : public Service,
       public InterfaceFactory<mojom::ShutdownTestClientController>,
       public mojom::ShutdownTestClientController,
       public mojom::ShutdownTestClient {
  public:
   ShutdownClientApp() {}
   ~ShutdownClientApp() override {}
 
  private:
   // service_manager::Service:
-  bool OnConnect(const Identity& remote_identity,
+  bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
     registry->AddInterface<mojom::ShutdownTestClientController>(this);
     return true;
   }
 
   // InterfaceFactory<mojom::ShutdownTestClientController>:
   void Create(const Identity& remote_identity,
               mojom::ShutdownTestClientControllerRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
@@ skipping 23 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ShutdownClientApp);
 };
 
 }  // namespace service_manager
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(new service_manager::ShutdownClientApp);
   return runner.Run(service_request_handle);
 }