Change Service contract to pass ServiceInfo instead of Identity

services/service_manager/service_manager.cc

 // Copyright 2014 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 "services/service_manager/service_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 236 matching lines @@
 
   const InterfaceProviderSpec& GetConnectionSpec() const {
     auto it = interface_provider_specs_.find(
         mojom::kServiceManager_ConnectorSpec);
     return it != interface_provider_specs_.end() ? it->second : empty_spec_;
   }
   const Identity& identity() const { return identity_; }
   uint32_t id() const { return id_; }
 
   // Service:
-  bool OnConnect(const Identity& remote_identity,
+  bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
-    Instance* source = service_manager_->GetExistingInstance(remote_identity);
+    Instance* source =
+        service_manager_->GetExistingInstance(remote_info.identity);
     DCHECK(source);
     if (HasCapability(source->GetConnectionSpec(),
                       kCapability_ServiceManager)) {
       registry->AddInterface<mojom::ServiceManager>(this);
       return true;
     }
     return false;
   }
 
  private:
@@ skipping 297 matching lines @@
   mojom::ServicePtr service;
   mojom::ServiceRequest request = mojo::GetProxy(&service);
   Connect(std::move(params), std::move(service), nullptr);
 
   return request;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceManager, Service implementation:
 
-bool ServiceManager::OnConnect(const Identity& remote_identity,
+bool ServiceManager::OnConnect(const ServiceInfo& remote_info,
                                InterfaceRegistry* registry) {
   // The only interface we expose is mojom::ServiceManager, and access to this
   // interface is brokered by a policy specific to each caller, managed by the
   // caller's instance. Here we look to see who's calling, and forward to the
   // caller's instance to continue.
   Instance* instance = nullptr;
   for (const auto& entry : identity_to_instance_) {
-    if (entry.first == remote_identity) {
+    if (entry.first == remote_info.identity) {
       instance = entry.second;
       break;
     }
   }
   DCHECK(instance);
-  return instance->OnConnect(remote_identity, registry);
+  return instance->OnConnect(remote_info, registry);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceManager, private:
 
 void ServiceManager::InitCatalog(mojom::ServicePtr catalog) {
   // TODO(beng): It'd be great to build this from the manifest, however there's
   //             a bit of a chicken-and-egg problem.
   InterfaceProviderSpec spec;
   spec.provides["app"].insert("filesystem::mojom::Directory");
@@ skipping 306 matching lines @@
   // Now that the instance has a Service, we can connect to it.
   bool connected = instance->ConnectToService(&params);
   DCHECK(connected);
 }
 
 base::WeakPtr<ServiceManager> ServiceManager::GetWeakPtr() {
   return weak_ptr_factory_.GetWeakPtr();
 }
 
 }  // namespace service_manager