Move shell service to toplevel shell namespace

services/user/user_shell_client.h

 // Copyright 2016 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 SERVICES_USER_USER_SHELL_CLIENT_H_
 #define SERVICES_USER_USER_SHELL_CLIENT_H_
 
 #include "base/memory/ref_counted.h"
 #include "components/filesystem/lock_table.h"
 #include "components/leveldb/public/interfaces/leveldb.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 #include "services/user/public/interfaces/user_service.mojom.h"
 
 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,
       scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner);
   ~UserShellClient() override;
 
  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();
 
   scoped_refptr<base::SingleThreadTaskRunner> user_service_runner_;
   scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner_;
 
   mojo::TracingImpl tracing_;
 
   // We create these two objects so we can delete them on the correct task
   // runners.
   class UserServiceObjects;
   scoped_ptr<UserServiceObjects> user_objects_;
 
   class LevelDBServiceObjects;
   scoped_ptr<LevelDBServiceObjects> leveldb_objects_;
 
   DISALLOW_COPY_AND_ASSIGN(UserShellClient);
 };
 
 }  // namespace user_service
 
 #endif  // SERVICES_USER_USER_SHELL_CLIENT_H_