Allow Catalogs to be constructed per-user

content/browser/mojo/mojo_shell_context.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
 #define CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_
 
 #include <map>
 
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
 #include "mojo/shell/public/interfaces/connector.mojom.h"
 #include "mojo/shell/shell.h"
 
 namespace catalog {
-class Owner;
+class Factory;
 }
 
 namespace mojo {
 class ShellClient;
 }
 
 namespace content {
 
 // MojoShellContext hosts the browser's ApplicationManager, coordinating
 // app registration and interconnection.
@@ skipping 24 matching lines @@
 
   void ConnectToApplicationOnOwnThread(
       const std::string& name,
       const std::string& requestor_name,
       mojo::shell::mojom::InterfaceProviderRequest request,
       mojo::shell::mojom::InterfaceProviderPtr exposed_services,
       const mojo::shell::mojom::Connector::ConnectCallback& callback);
 
   static base::LazyInstance<scoped_ptr<Proxy>> proxy_;
 
-  scoped_ptr<catalog::Owner> catalog_;
+  scoped_ptr<catalog::Factory> catalog_;
   scoped_ptr<mojo::shell::Shell> shell_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellContext);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MOJO_MOJO_SHELL_CONTEXT_H_