Support reading multiple InterfaceProviderSpecs from manifests

services/service_manager/public/cpp/lib/service_context.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/public/cpp/service_context.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
@@ skipping 31 matching lines @@
 void ServiceContext::SetConnectionLostClosure(const base::Closure& closure) {
   connection_lost_closure_ = closure;
   if (should_run_connection_lost_closure_ &&
       !connection_lost_closure_.is_null())
     connection_lost_closure_.Run();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceContext, mojom::Service implementation:
 
-void ServiceContext::OnStart(const service_manager::Identity& identity,
+void ServiceContext::OnStart(const ServiceInfo& info,
                              const OnStartCallback& callback) {
-  identity_ = identity;
+  identity_ = info.identity;
   if (!initialize_handler_.is_null())
     initialize_handler_.Run();
 
   callback.Run(std::move(pending_connector_request_));
 
   service_->OnStart(identity_);
 }
 
 void ServiceContext::OnConnect(
-    const Identity& source,
+    const ServiceInfo& source_info,
     mojom::InterfaceProviderRequest interfaces,
     const InterfaceSet& allowed_interfaces,
     const CapabilitySet& allowed_capabilities) {
   // TODO(beng): do something with |allowed_capabilities|.
-  std::unique_ptr<InterfaceRegistry> registry(
-      new InterfaceRegistry(identity_, source, allowed_interfaces));
+  auto registry = base::MakeUnique<InterfaceRegistry>(
+      identity_, source_info.identity, allowed_interfaces);
   registry->Bind(std::move(interfaces));
 
-  if (!service_->OnConnect(source, registry.get()))
+  if (!service_->OnConnect(source_info.identity, registry.get()))
     return;
 
   // TODO(beng): it appears we never prune this list. We should, when the
   //             registry's remote interface provider pipe breaks.
   incoming_connections_.push_back(std::move(registry));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ServiceContext, private:
 
 void ServiceContext::OnConnectionError() {
   // Note that the Service doesn't technically have to quit now, it may live
   // on to service existing connections. All existing Connectors however are
   // invalid.
   should_run_connection_lost_closure_ = service_->OnStop();
   if (should_run_connection_lost_closure_ &&
       !connection_lost_closure_.is_null())
     connection_lost_closure_.Run();
   // We don't reset the connector as clients may have taken a raw pointer to it.
   // Connect() will return nullptr if they try to connect to anything.
 }
 
 }  // namespace service_manager