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

mojo/services/catalog/store.h

Index: mojo/services/catalog/store.h
diff --git a/mojo/services/catalog/store.h b/mojo/services/catalog/store.h
index 74309b687f22c82c6ea4dacfb7a1d9a7d2e465b2..cb763d510fcee4abe0728eb8419a6d7e906292d8 100644
--- a/mojo/services/catalog/store.h
+++ b/mojo/services/catalog/store.h
@@ -14,15 +14,24 @@ namespace catalog {
 // contents of the store, so no one else must modify its contents.
 class Store {
  public:
+  // Value is an integer.
+  static const char kManifestVersionKey[];
   // Value is a string.
   static const char kNameKey[];
   // Value is a string.
   static const char kQualifierKey[];
   // Value is a string.
   static const char kDisplayNameKey[];
-  // Value is a dictionary that maps from the filter to a list of string
-  // interfaces.
+  // Value is a dictionary.
   static const char kCapabilitiesKey[];
+  // Value is a dictionary.
+  static const char kCapabilities_ProvidedKey[];
+  // Value is a dictionary.
+  static const char kCapabilities_RequiredKey[];
+  // Value is a list.
+  static const char kCapabilities_ClassesKey[];
+  // Value is a list.
+  static const char kCapabilities_InterfacesKey[];
 
   virtual ~Store() {}