Change Service contract to pass ServiceInfo instead of Identity

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 "mojo/public/cpp/bindings/binding_set.h"
@@ skipping 23 matching lines @@
         destruct_callback_(destruct_callback) {
     bindings_.set_connection_error_handler(base::Bind(&PackagedApp::BindingLost,
                                                       base::Unretained(this)));
   }
   ~PackagedApp() override {
     destruct_callback_.Run(this);
   }
 
  private:
   // service_manager::Service:
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface<LifecycleControl>(this);
     return true;
   }
 
   // service_manager::InterfaceFactory<LifecycleControl>
   void Create(const service_manager::Identity& remote_identity,
               LifecycleControlRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
@@ skipping 42 matching lines @@
  public:
   Package() {}
   ~Package() override {}
 
   void set_runner(service_manager::ServiceRunner* runner) {
     app_client_.set_runner(runner);
   }
 
  private:
   // service_manager::test::AppClient:
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface<service_manager::mojom::ServiceFactory>(this);
-    return app_client_.OnConnect(remote_identity, registry);
+    return app_client_.OnConnect(remote_info, registry);
   }
 
   // service_manager::InterfaceFactory<service_manager::mojom::ServiceFactory>:
   void Create(const service_manager::Identity& remote_identity,
               service_manager::mojom::ServiceFactoryRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // service_manager::mojom::ServiceFactory:
   void CreateService(service_manager::mojom::ServiceRequest request,
@@ skipping 28 matching lines @@
 };
 
 }  // namespace
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   Package* package = new Package;
   service_manager::ServiceRunner runner(package);
   package->set_runner(&runner);
   return runner.Run(service_request_handle);
 }