Support reading multiple InterfaceProviderSpecs from manifests

services/service_manager/public/interfaces/resolver.mojom

 // 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.
 
 module service_manager.mojom;
 
 import "mojo/common/common_custom_types.mojom";
 import "services/service_manager/public/interfaces/interface_provider_spec.mojom";
 
 // The result of a Resolve operation via Resolver.
 struct ResolveResult {
   // The mojo: name that was requested to be resolved.
   string name;
 
   // The mojo: name of the physical package supplying the requested name. This
   // could be the same name that was passed, or the name of a package that
   // contains it.
   string resolved_name;
 
   // An additional piece of metadata that identifies what instance |name| should
   // be run in. It's possible that |name| may provide several services that
   // should be run as different instances.
   string qualifier;
 
-  // The set of capabilities provided and required by |name|.
-  // TODO(beng): Fix comment.
-  InterfaceProviderSpec? connection_spec;
+  // Contains the contents of the interface_provider_specs section in |name|'s
+  // service manifest. If a manifest could be loaded, this map will contain at
+  // least one key: |kServiceManager_ConnectorSpec| as defined in
+  // interface_provider_spec.mojom. If a manifest could not be loaded, this map
+  // will be empty.
+  map<string, InterfaceProviderSpec> interface_provider_specs;
 
   // A path to the package file specified by |name|.
   mojo.common.mojom.FilePath package_path;
 };
 
 // Implemented exclusively for the Service Manager's use in resolving mojo:
 // names and reading static manifest information.
 interface Resolver {
   // Resolves |mojo_name| and returns a ResolveResult containing metadata from
   // the catalog that the Service Manager uses to run an instance of it.
   ResolveMojoName(string mojo_name) => (ResolveResult result);
 };