Support reading multiple InterfaceProviderSpecs from manifests

services/catalog/entry.h

Index: services/catalog/entry.h
diff --git a/services/catalog/entry.h b/services/catalog/entry.h
index c57e498c7a1442d40eb07a18c7e88b6e5e85bece..2998924c00ec9239f85c2be800b81326045031ca 100644
--- a/services/catalog/entry.h
+++ b/services/catalog/entry.h
@@ -34,10 +34,9 @@ class Entry {
   // 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; }
@@ -49,12 +48,12 @@ class Entry {
   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; }
@@ -68,7 +67,7 @@ class Entry {
   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_;
 };