Allow Catalogs to be constructed per-user

mojo/shell/standalone/context.h

Index: mojo/shell/standalone/context.h
diff --git a/mojo/shell/standalone/context.h b/mojo/shell/standalone/context.h
index 6d10318f39ad7b7417640383b0dba97b5faa615f..09f7942d027c462bada855ac23956402c1c2e819 100644
--- a/mojo/shell/standalone/context.h
+++ b/mojo/shell/standalone/context.h
@@ -20,7 +20,7 @@ class SingleThreadTaskRunner;
 }
 
 namespace catalog {
-class Owner;
+class Factory;
 class Store;
 }
 
@@ -70,7 +70,7 @@ class Context : public edk::ProcessDelegate {
   // Ensure this is destructed before task_runners_ since it owns a message pipe
   // that needs the IO thread to destruct cleanly.
   Tracer tracer_;
-  scoped_ptr<catalog::Owner> catalog_;
+  scoped_ptr<catalog::Factory> catalog_;
   scoped_ptr<Shell> shell_;
   base::Time main_entry_time_;