Move shell service to toplevel shell namespace

components/mus/mus_app.h

Index: components/mus/mus_app.h
diff --git a/components/mus/mus_app.h b/components/mus/mus_app.h
index 289facab7e2337252be798ea56044b4dc78ed64a..e90311a4905738081e056be64424bec62566a440 100644
--- a/components/mus/mus_app.h
+++ b/components/mus/mus_app.h
@@ -26,7 +26,7 @@
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 
-namespace mojo {
+namespace shell {
 class Connector;
 }
 
@@ -41,14 +41,14 @@ class WindowServer;
 }
 
 class MandolineUIServicesApp
-    : public mojo::ShellClient,
+    : public shell::ShellClient,
       public ws::WindowServerDelegate,
-      public mojo::InterfaceFactory<mojom::DisplayManager>,
-      public mojo::InterfaceFactory<mojom::UserAccessManager>,
-      public mojo::InterfaceFactory<mojom::WindowManagerFactoryService>,
-      public mojo::InterfaceFactory<mojom::WindowTreeFactory>,
-      public mojo::InterfaceFactory<mojom::WindowTreeHostFactory>,
-      public mojo::InterfaceFactory<mojom::Gpu> {
+      public shell::InterfaceFactory<mojom::DisplayManager>,
+      public shell::InterfaceFactory<mojom::UserAccessManager>,
+      public shell::InterfaceFactory<mojom::WindowManagerFactoryService>,
+      public shell::InterfaceFactory<mojom::WindowTreeFactory>,
+      public shell::InterfaceFactory<mojom::WindowTreeHostFactory>,
+      public shell::InterfaceFactory<mojom::Gpu> {
  public:
   MandolineUIServicesApp();
   ~MandolineUIServicesApp() override;
@@ -61,48 +61,50 @@ class MandolineUIServicesApp
 
   using UserIdToUserState = std::map<ws::UserId, scoped_ptr<UserState>>;
 
-  void InitializeResources(mojo::Connector* connector);
+  void InitializeResources(shell::Connector* connector);
 
   // Returns the user specific state for the user id of |connection|. MusApp
   // owns the return value.
   // TODO(sky): if we allow removal of user ids then we need to close anything
   // associated with the user (all incoming pipes...) on removal.
-  UserState* GetUserState(mojo::Connection* connection);
+  UserState* GetUserState(shell::Connection* connection);
 
-  void AddUserIfNecessary(mojo::Connection* connection);
+  void AddUserIfNecessary(shell::Connection* connection);
 
-  // mojo::ShellClient:
-  void Initialize(mojo::Connector* connector, const mojo::Identity& identity,
+  // shell::ShellClient:
+  void Initialize(shell::Connector* connector,
+                  const shell::Identity& identity,
                   uint32_t id) override;
-  bool AcceptConnection(mojo::Connection* connection) override;
+  bool AcceptConnection(shell::Connection* connection) override;
 
   // WindowServerDelegate:
   void OnFirstDisplayReady() override;
   void OnNoMoreDisplays() override;
   void CreateDefaultDisplays() override;
 
-  // mojo::InterfaceFactory<mojom::DisplayManager> implementation.
-  void Create(mojo::Connection* connection,
+  // shell::InterfaceFactory<mojom::DisplayManager> implementation.
+  void Create(shell::Connection* connection,
               mojom::DisplayManagerRequest request) override;
 
-  // mojo::InterfaceFactory<mojom::UserAccessManager> implementation.
-  void Create(mojo::Connection* connection,
+  // shell::InterfaceFactory<mojom::UserAccessManager> implementation.
+  void Create(shell::Connection* connection,
               mojom::UserAccessManagerRequest request) override;
 
-  // mojo::InterfaceFactory<mojom::WindowManagerFactoryService> implementation.
-  void Create(mojo::Connection* connection,
+  // shell::InterfaceFactory<mojom::WindowManagerFactoryService> implementation.
+  void Create(shell::Connection* connection,
               mojom::WindowManagerFactoryServiceRequest request) override;
 
-  // mojo::InterfaceFactory<mojom::WindowTreeFactory>:
-  void Create(mojo::Connection* connection,
+  // shell::InterfaceFactory<mojom::WindowTreeFactory>:
+  void Create(shell::Connection* connection,
               mojom::WindowTreeFactoryRequest request) override;
 
-  // mojo::InterfaceFactory<mojom::WindowTreeHostFactory>:
-  void Create(mojo::Connection* connection,
+  // shell::InterfaceFactory<mojom::WindowTreeHostFactory>:
+  void Create(shell::Connection* connection,
               mojom::WindowTreeHostFactoryRequest request) override;
 
-  // mojo::InterfaceFactory<mojom::Gpu> implementation.
-  void Create(mojo::Connection* connection, mojom::GpuRequest request) override;
+  // shell::InterfaceFactory<mojom::Gpu> implementation.
+  void Create(shell::Connection* connection,
+              mojom::GpuRequest request) override;
 
   ws::PlatformDisplayInitParams platform_display_init_params_;
   scoped_ptr<ws::WindowServer> window_server_;