Support reading multiple InterfaceProviderSpecs from manifests

services/catalog/instance.cc

 // 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.
 
 #include "services/catalog/instance.h"
 
 #include "base/bind.h"
 #include "services/catalog/entry.h"
 #include "services/catalog/manifest_provider.h"
 #include "services/catalog/reader.h"
@@ skipping 50 matching lines @@
 void Instance::ResolveMojoName(const std::string& mojo_name,
                                const ResolveMojoNameCallback& callback) {
   DCHECK(system_cache_);
 
   std::string type = service_manager::GetNameType(mojo_name);
   if (type != service_manager::kNameType_Service &&
       type != service_manager::kNameType_Exe) {
     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;
   }
 
   // TODO(beng): per-user catalogs.
   auto entry = system_cache_->find(mojo_name);
   if (entry != system_cache_->end()) {
     callback.Run(service_manager::mojom::ResolveResult::From(*entry->second));
     return;
   }
@@ skipping 25 matching lines @@
       if (system_cache_->find(name) != system_cache_->end())
         entry = (*system_cache_)[name].get();
       else
         continue;
       AddEntry(*entry, &entries);
     }
   }
   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));
 }
 
 void Instance::GetEntriesConsumingMIMEType(
     const std::string& mime_type,
     const GetEntriesConsumingMIMETypeCallback& callback) {
   // TODO(beng): implement.
 }
 
@@ skipping 38 matching lines @@
 void Instance::OnReadManifest(base::WeakPtr<Instance> instance,
                               const std::string& mojo_name,
                               const ResolveMojoNameCallback& callback,
                               service_manager::mojom::ResolveResultPtr result) {
   callback.Run(std::move(result));
   if (instance)
     instance->SerializeCatalog();
 }
 
 }  // namespace catalog