Change Service contract to pass ServiceInfo instead of Identity

services/service_manager/tests/connect/connect_test_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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
 
@@ skipping 43 matching lines @@
         title_(title),
         request_(std::move(request)) {
     Start();
   }
   ~ProvidedService() override {
     Join();
   }
 
  private:
   // service_manager::Service:
-  void OnStart(const Identity& identity) override {
-    identity_ = identity;
+  void OnStart(const ServiceInfo& info) override {
+    identity_ = info.identity;
     bindings_.set_connection_error_handler(
         base::Bind(&ProvidedService::OnConnectionError,
                    base::Unretained(this)));
   }
-  bool OnConnect(const Identity& remote_identity,
+  bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
     registry->AddInterface<test::mojom::ConnectTestService>(this);
     registry->AddInterface<test::mojom::BlockedInterface>(this);
     registry->AddInterface<test::mojom::UserIdTest>(this);
 
     test::mojom::ConnectionStatePtr state(test::mojom::ConnectionState::New());
-    state->connection_remote_name = remote_identity.name();
-    state->connection_remote_userid = remote_identity.user_id();
+    state->connection_remote_name = remote_info.identity.name();
+    state->connection_remote_userid = remote_info.identity.user_id();
     state->initialize_local_name = identity_.name();
     state->initialize_userid = identity_.user_id();
 
-    connector()->ConnectToInterface(remote_identity, &caller_);
+    connector()->ConnectToInterface(remote_info.identity, &caller_);
     caller_->ConnectionAccepted(std::move(state));
 
     return true;
   }
 
   // InterfaceFactory<test::mojom::ConnectTestService>:
   void Create(const Identity& remote_identity,
               test::mojom::ConnectTestServiceRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
@@ skipping 69 matching lines @@
       public InterfaceFactory<mojom::ServiceFactory>,
       public InterfaceFactory<test::mojom::ConnectTestService>,
       public mojom::ServiceFactory,
       public test::mojom::ConnectTestService {
  public:
   ConnectTestService() {}
   ~ConnectTestService() override {}
 
  private:
   // service_manager::Service:
-  void OnStart(const Identity& identity) override {
-    identity_ = identity;
+  void OnStart(const ServiceInfo& info) override {
+    identity_ = info.identity;
     bindings_.set_connection_error_handler(
         base::Bind(&ConnectTestService::OnConnectionError,
                    base::Unretained(this)));
   }
-  bool OnConnect(const Identity& remote_identity,
+  bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
     registry->AddInterface<ServiceFactory>(this);
     registry->AddInterface<test::mojom::ConnectTestService>(this);
     return true;
   }
 
   // InterfaceFactory<mojom::ServiceFactory>:
   void Create(const Identity& remote_identity,
               mojom::ServiceFactoryRequest request) override {
     service_factory_bindings_.AddBinding(this, std::move(request));
@@ skipping 35 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ConnectTestService);
 };
 
 }  // namespace service_manager
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   service_manager::ServiceRunner runner(
       new service_manager::ConnectTestService);
   return runner.Run(service_request_handle);
 }