Morph CapabilityFilter into caps::Capabilities, which supports capability classes (yet unimplemente…

mojo/services/catalog/entry.h

Index: mojo/services/catalog/entry.h
diff --git a/mojo/services/catalog/entry.h b/mojo/services/catalog/entry.h
index 4f2f64a4526ef2a3731c72a30cff0faf65b530f7..4b7ffa803d5040feb7e22519b42e1e568bc33655 100644
--- a/mojo/services/catalog/entry.h
+++ b/mojo/services/catalog/entry.h
@@ -5,17 +5,11 @@
 #ifndef MOJO_SERVICES_CATALOG_ENTRY_H_
 #define MOJO_SERVICES_CATALOG_ENTRY_H_
 
-#include <map>
-#include <set>
 #include <string>
 
-namespace catalog {
+#include "mojo/shell/public/cpp/capabilities.h"
 
-// A set of names of interfaces that may be exposed to an application.
-using AllowedInterfaces = std::set<std::string>;
-// A map of allowed applications to allowed interface sets. See shell.mojom for
-// more details.
-using CapabilityFilter = std::map<std::string, AllowedInterfaces>;
+namespace catalog {
 
 // Static information about an application package known to the Catalog.
 struct Entry {
@@ -23,10 +17,12 @@ struct Entry {
   Entry(const Entry& other);
   ~Entry();
 
+  bool operator==(const Entry& other) const;
+
   std::string name;
   std::string qualifier;
   std::string display_name;
-  CapabilityFilter capabilities;
+  mojo::CapabilitySpec capabilities;
 };
 
 }  // namespace catalog