Support reading multiple InterfaceProviderSpecs from manifests

services/catalog/entry.h

 // 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.
 
 #ifndef SERVICES_CATALOG_ENTRY_H_
 #define SERVICES_CATALOG_ENTRY_H_
 
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 16 matching lines @@
   explicit Entry(const std::string& name);
   ~Entry();
 
   std::unique_ptr<base::DictionaryValue> Serialize() const;
 
   // If the constructed Entry is a package that provides other Entrys, the
   // caller must assume ownership of the tree of Entrys by enumerating
   // services().
   static std::unique_ptr<Entry> Deserialize(const base::DictionaryValue& value);
 
-  bool ProvidesClass(const std::string& clazz) const;
+  bool ProvidesCapability(const std::string& capability) const;
 
   bool operator==(const Entry& other) const;
-  bool operator<(const Entry& other) const;
 
   const std::string& name() const { return name_; }
   void set_name(const std::string& name) { name_ = name; }
   const base::FilePath& path() const { return path_; }
   void set_path(const base::FilePath& path) { path_ = path; }
   const std::string& qualifier() const { return qualifier_; }
   void set_qualifier(const std::string& qualifier) { qualifier_ = qualifier; }
   const std::string& display_name() const { return display_name_; }
   void set_display_name(const std::string& display_name) {
     display_name_ = display_name;
   }
-  const service_manager::InterfaceProviderSpec& connection_spec() const {
-    return connection_spec_;
-  }
-  void set_connection_spec(
-      const service_manager::InterfaceProviderSpec& connection_spec) {
-    connection_spec_ = connection_spec;
+  void AddInterfaceProviderSpec(
+      const std::string& name,
+      const service_manager::InterfaceProviderSpec& spec);
+  const service_manager::InterfaceProviderSpecMap&
+      interface_provider_specs() const {
+    return interface_provider_specs_;
   }
   const Entry* package() const { return package_; }
   void set_package(Entry* package) { package_ = package; }
 
   std::vector<std::unique_ptr<Entry>> TakeChildren() {
     return std::move(children_);
   }
 
  private:
   std::string name_;
   base::FilePath path_;
   std::string qualifier_;
   std::string display_name_;
-  service_manager::InterfaceProviderSpec connection_spec_;
+  service_manager::InterfaceProviderSpecMap interface_provider_specs_;
   Entry* package_ = nullptr;
   std::vector<std::unique_ptr<Entry>> children_;
 };
 
 }  // namespace catalog
 
 namespace mojo {
 template <>
 struct TypeConverter<service_manager::mojom::ResolveResultPtr, catalog::Entry> {
   static service_manager::mojom::ResolveResultPtr Convert(
       const catalog::Entry& input);
 };
 
 template<>
 struct TypeConverter<catalog::mojom::EntryPtr, catalog::Entry> {
   static catalog::mojom::EntryPtr Convert(const catalog::Entry& input);
 };
 
 }  // namespace mojo
 
 #endif  // SERVICES_CATALOG_ENTRY_H_