Service Manager: Miscellaneous catalog cleanup

services/service_manager/public/interfaces/resolver.mojom

Index: services/service_manager/public/interfaces/resolver.mojom
diff --git a/services/service_manager/public/interfaces/resolver.mojom b/services/service_manager/public/interfaces/resolver.mojom
index 9f84612f72ae75e61643ed97e2635d3d7da38f89..5bebbdb6b89ffb59d39270cc29ece427ca7ac81f 100644
--- a/services/service_manager/public/interfaces/resolver.mojom
+++ b/services/service_manager/public/interfaces/resolver.mojom
@@ -9,19 +9,9 @@ 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.
+  // The 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;
-
   // 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
@@ -29,14 +19,11 @@ struct ResolveResult {
   // will be empty.
   map<string, InterfaceProviderSpec> interface_provider_specs;
 
-  // The set of capabilities of the containing package if any.
-  InterfaceProviderSpec? package_spec;
-
   // 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:
+// Implemented exclusively for the Service Manager's use in resolving service
 // names and reading static manifest information.
 interface Resolver {
   // Resolves |service_name| and returns a ResolveResult containing metadata
@@ -44,5 +31,8 @@ interface Resolver {
   //
   // If no entry for |service_name| is found in the catalog, |result| is null.
   //
-  ResolveServiceName(string service_name) => (ResolveResult? result);
+  // If the service is provided by another service, information about the
+  // parent is given by |parent|; otherwise |parent| is null.
+  ResolveServiceName(string service_name)
+      => (ResolveResult? result, ResolveResult? parent);
 };