Implement a system-level entry cache so that packages loaded from the system dir can be visible to …

mojo/services/catalog/factory.h

Index: mojo/services/catalog/factory.h
diff --git a/mojo/services/catalog/factory.h b/mojo/services/catalog/factory.h
index 545acf36e7a4d8360d90e1d1d6f66ec34f0ed6dc..758d9da8e81ddf7cccf8d7a7c3e56c47a32f5438 100644
--- a/mojo/services/catalog/factory.h
+++ b/mojo/services/catalog/factory.h
@@ -14,6 +14,7 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
 #include "mojo/services/catalog/public/interfaces/resolver.mojom.h"
+#include "mojo/services/catalog/types.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/interfaces/shell_client.mojom.h"
 #include "mojo/shell/public/interfaces/shell_resolver.mojom.h"
@@ -70,6 +71,8 @@ class Factory
 
   std::map<std::string, scoped_ptr<Catalog>> catalogs_;
 
+  EntryCache system_catalog_;
+
   base::WeakPtrFactory<Factory> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Factory);