Move shell service to toplevel shell namespace

mash/init/init.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 MASH_INIT_INIT_H_
 #define MASH_INIT_INIT_H_
 
 #include <map>
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "mash/init/public/interfaces/init.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_client.h"
 
 namespace mojo {
 class Connection;
 }
 
 namespace mash {
 namespace init {
 
-class Init : public mojo::ShellClient,
-             public mojo::InterfaceFactory<mojom::Init>,
+class Init : public shell::ShellClient,
+             public shell::InterfaceFactory<mojom::Init>,
              public mojom::Init {
  public:
   Init();
   ~Init() override;
 
  private:
-  // 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;
 
-  // mojo::InterfaceFactory<mojom::Login>:
-  void Create(mojo::Connection* connection,
+  // shell::InterfaceFactory<mojom::Login>:
+  void Create(shell::Connection* connection,
               mojom::InitRequest request) override;
 
   // mojom::Init:
   void StartService(const mojo::String& name,
                     const mojo::String& user_id) override;
   void StopServicesForUser(const mojo::String& user_id) override;
 
   void UserServiceQuit(const std::string& user_id);
 
   void StartTracing();
   void StartResourceProvider();
   void StartLogin();
 
-  mojo::Connector* connector_;
-  std::unique_ptr<mojo::Connection> login_connection_;
+  shell::Connector* connector_;
+  std::unique_ptr<shell::Connection> login_connection_;
   mojo::BindingSet<mojom::Init> init_bindings_;
-  std::map<std::string, std::unique_ptr<mojo::Connection>> user_services_;
+  std::map<std::string, std::unique_ptr<shell::Connection>> user_services_;
 
   DISALLOW_COPY_AND_ASSIGN(Init);
 };
 
 }  // namespace init
 }  // namespace mash
 
 #endif  // MASH_INIT_INIT_H_