Support reading multiple InterfaceProviderSpecs from manifests

services/service_manager/public/cpp/lib/service_context.cc

Index: services/service_manager/public/cpp/lib/service_context.cc
diff --git a/services/service_manager/public/cpp/lib/service_context.cc b/services/service_manager/public/cpp/lib/service_context.cc
index 1460291e8522e3df0251b826a55af311d0633322..42f924147cd7c6f4562cd996b0092e35b2f6b07c 100644
--- a/services/service_manager/public/cpp/lib/service_context.cc
+++ b/services/service_manager/public/cpp/lib/service_context.cc
@@ -49,9 +49,9 @@ void ServiceContext::SetConnectionLostClosure(const base::Closure& closure) {
 ////////////////////////////////////////////////////////////////////////////////
 // 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();
 
@@ -61,16 +61,16 @@ void ServiceContext::OnStart(const service_manager::Identity& 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