CapabilitySpec

mojo/services/package_manager/package_manager.h

Index: mojo/services/package_manager/package_manager.h
diff --git a/mojo/services/package_manager/package_manager.h b/mojo/services/package_manager/package_manager.h
index 6c17dde137fedcc4d40b82177c78c3d62e8611d3..cd5f53e0f051dc0b60366382d3162f2f416479e4 100644
--- a/mojo/services/package_manager/package_manager.h
+++ b/mojo/services/package_manager/package_manager.h
@@ -12,17 +12,13 @@
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/services/package_manager/public/interfaces/catalog.mojom.h"
 #include "mojo/services/package_manager/public/interfaces/resolver.mojom.h"
+#include "mojo/shell/public/cpp/capabilities.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/interfaces/shell_resolver.mojom.h"
 #include "url/gurl.h"
 
 namespace package_manager {
-// 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>;
 
 // Static information about an application package known to the PackageManager.
 struct ApplicationInfo {
@@ -33,7 +29,7 @@ struct ApplicationInfo {
   std::string name;
   std::string qualifier;
   std::string display_name;
-  CapabilityFilter base_filter;
+  Capabilities capabilities;
 };
 
 // Implemented by an object that provides storage for the application catalog
@@ -47,9 +43,12 @@ class ApplicationCatalogStore {
   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.
+
   static const char kCapabilitiesKey[];
+  static const char kCapabilities_ProvidedKey[];
+  static const char kCapabilities_RequiredKey[];
+  static const char kCapabilities_InterfacesKey[];
+  static const char kCapabilities_ClassesKey[];
 
   virtual ~ApplicationCatalogStore() {}