Allow Catalogs to be constructed per-user

mojo/shell/shell.h

Index: mojo/shell/shell.h
diff --git a/mojo/shell/shell.h b/mojo/shell/shell.h
index b0b00c9519a981f95423dc8fc90a96fd182b5dbb..03e9bfd8459096cb57b1c59bfb29a6249478e5d9 100644
--- a/mojo/shell/shell.h
+++ b/mojo/shell/shell.h
@@ -154,7 +154,8 @@ class Shell : public ShellClient {
   // |file_url| is the resolved file:// URL of the physical package.
   // |capabilities| is the CapabilitySpecPtr the requested application should be
   // run with, from its manifest.
-  void OnGotResolvedName(scoped_ptr<ConnectParams> params,
+  void OnGotResolvedName(mojom::ShellResolverPtr resolver,
+                         scoped_ptr<ConnectParams> params,
                          mojom::ShellClientPtr client,
                          const String& resolved_name,
                          const String& resolved_instance,
@@ -172,8 +173,6 @@ class Shell : public ShellClient {
 
   void CleanupRunner(NativeRunner* runner);
 
-  mojom::ShellResolverPtr shell_resolver_;
-
   // Loader management.
   // Loaders are chosen in the order they are listed here.
   NameToLoaderMap name_to_loader_;