Move shell service to toplevel shell namespace

services/user/user_shell_client.h

Index: services/user/user_shell_client.h
diff --git a/services/user/user_shell_client.h b/services/user/user_shell_client.h
index de52157e01cac978383cd2ebd5b88f53cd9c2b3b..f9c5dda4e074d43ce2b2f72e3b6daa042d7d4dfa 100644
--- a/services/user/user_shell_client.h
+++ b/services/user/user_shell_client.h
@@ -16,13 +16,14 @@
 
 namespace user_service {
 
-scoped_ptr<mojo::ShellClient> CreateUserShellClient(
+scoped_ptr<shell::ShellClient> CreateUserShellClient(
     scoped_refptr<base::SingleThreadTaskRunner> user_service_runner,
     scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner);
 
-class UserShellClient : public mojo::ShellClient,
-                        public mojo::InterfaceFactory<mojom::UserService>,
-                        public mojo::InterfaceFactory<leveldb::LevelDBService> {
+class UserShellClient
+    : public shell::ShellClient,
+      public shell::InterfaceFactory<mojom::UserService>,
+      public shell::InterfaceFactory<leveldb::LevelDBService> {
  public:
   UserShellClient(
       scoped_refptr<base::SingleThreadTaskRunner> user_service_runner,
@@ -31,20 +32,20 @@ class UserShellClient : public mojo::ShellClient,
 
  private:
   // |ShellClient| override:
-  void Initialize(mojo::Connector* connector,
-                  const mojo::Identity& identity,
+  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;
 
   // |InterfaceFactory<mojom::UserService>| implementation:
-  void Create(mojo::Connection* connection,
+  void Create(shell::Connection* connection,
               mojom::UserServiceRequest request) override;
 
   // |InterfaceFactory<LevelDBService>| implementation:
-  void Create(mojo::Connection* connection,
+  void Create(shell::Connection* connection,
               leveldb::LevelDBServiceRequest request) override;
 
-  void OnLevelDBServiceRequest(mojo::Connection* connection,
+  void OnLevelDBServiceRequest(shell::Connection* connection,
                                leveldb::LevelDBServiceRequest request);
   void OnLevelDBServiceError();