Support reading multiple InterfaceProviderSpecs from manifests

services/catalog/instance.cc

Index: services/catalog/instance.cc
diff --git a/services/catalog/instance.cc b/services/catalog/instance.cc
index 7ac21f8b0c52d1234d071026ca684dbdc49a6688..6572d99ff720aa89c8f0ee6ef19403995f203d22 100644
--- a/services/catalog/instance.cc
+++ b/services/catalog/instance.cc
@@ -68,7 +68,6 @@ void Instance::ResolveMojoName(const std::string& mojo_name,
     std::unique_ptr<Entry> entry(new Entry(mojo_name));
     service_manager::mojom::ResolveResultPtr result =
         service_manager::mojom::ResolveResult::From(*entry);
-    result->connection_spec = base::nullopt;
     callback.Run(std::move(result));
     return;
   }
@@ -114,12 +113,12 @@ void Instance::GetEntries(const base::Optional<std::vector<std::string>>& names,
   callback.Run(std::move(entries));
 }
 
-void Instance::GetEntriesProvidingClass(
-    const std::string& clazz,
-    const GetEntriesProvidingClassCallback& callback) {
+void Instance::GetEntriesProvidingCapability(
+    const std::string& capability,
+    const GetEntriesProvidingCapabilityCallback& callback) {
   std::vector<mojom::EntryPtr> entries;
   for (const auto& entry : *system_cache_)
-    if (entry.second->ProvidesClass(clazz))
+    if (entry.second->ProvidesCapability(capability))
       entries.push_back(mojom::Entry::From(*entry.second));
   callback.Run(std::move(entries));
 }