Add a test for application lifecycle

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 f4b0e93a096fe1090322b9443a6fc6fd1af275da..54a5777ad3ee4a35d945897baee381f8e01fd554 100644
--- a/mojo/services/package_manager/package_manager.h
+++ b/mojo/services/package_manager/package_manager.h
@@ -31,6 +31,7 @@ struct ApplicationInfo {
   ~ApplicationInfo();
 
   std::string name;
+  std::string qualifier;
   std::string display_name;
   CapabilityFilter base_filter;
 };
@@ -43,6 +44,8 @@ class ApplicationCatalogStore {
   // 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.
@@ -123,10 +126,10 @@ class PackageManager : public mojo::ShellClient,
   bool IsNameInCatalog(const std::string& name) const;
 
   // Called from ResolveMojoName().
-  // If |name| is not in the catalog, attempts to load a manifest for it.
-  void EnsureNameInCatalog(const std::string& name,
-                           const std::string& qualifier,
-                           const ResolveMojoNameCallback& callback);
+  // Attempts to load a manifest for |name|, reads it and adds its metadata to
+  // the catalog.
+  void AddNameToCatalog(const std::string& name,
+                        const ResolveMojoNameCallback& callback);
 
   // Populate/serialize the catalog from/to the supplied store.
   void DeserializeCatalog();
@@ -142,13 +145,11 @@ class PackageManager : public mojo::ShellClient,
   // but |callback| must be run.
   static void OnReadManifest(base::WeakPtr<PackageManager> pm,
                              const std::string& name,
-                             const std::string& qualifier,
                              const ResolveMojoNameCallback& callback,
                              scoped_ptr<base::Value> manifest);
 
   // Called once the manifest is read and |this| hasn't been deleted.
   void OnReadManifestImpl(const std::string& name,
-                          const std::string& qualifier,
                           const ResolveMojoNameCallback& callback,
                           scoped_ptr<base::Value> manifest);
 
@@ -167,6 +168,8 @@ class PackageManager : public mojo::ShellClient,
   // the handler along with a qualifier.
   MojoNameAliasMap mojo_name_aliases_;
 
+  std::map<std::string, std::string> qualifiers_;
+
   base::WeakPtrFactory<PackageManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PackageManager);