Move shell service to toplevel shell namespace

services/shell/tests/lifecycle/app_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_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_
 #define SERVICES_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_
 
+#include <memory>
+
 #include "base/bind.h"
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/interfaces/shell_client.mojom.h"
 #include "services/shell/tests/lifecycle/lifecycle_unittest.mojom.h"
 
-using LifecycleControl = mojo::shell::test::mojom::LifecycleControl;
-using LifecycleControlRequest =
-    mojo::shell::test::mojom::LifecycleControlRequest;
+using LifecycleControl = shell::test::mojom::LifecycleControl;
+using LifecycleControlRequest = shell::test::mojom::LifecycleControlRequest;
 
-namespace mojo {
+namespace shell {
 class ShellConnection;
-namespace shell {
+
 namespace test {
 
 class AppClient : public ShellClient,
                   public InterfaceFactory<LifecycleControl>,
                   public LifecycleControl {
  public:
   AppClient();
   explicit AppClient(shell::mojom::ShellClientRequest request);
   ~AppClient() override;
 
@@ skipping 10 matching lines @@
   // LifecycleControl:
   void Ping(const PingCallback& callback) override;
   void GracefulQuit() override;
   void Crash() override;
   void CloseShellConnection() override;
 
  private:
   void BindingLost();
 
   ApplicationRunner* runner_ = nullptr;
-  BindingSet<LifecycleControl> bindings_;
-  scoped_ptr<ShellConnection> connection_;
+  mojo::BindingSet<LifecycleControl> bindings_;
+  std::unique_ptr<ShellConnection> connection_;
 
   DISALLOW_COPY_AND_ASSIGN(AppClient);
 };
 
 }  // namespace test
 }  // namespace shell
-}  // namespace mojo
 
 #endif  // SERVICES_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_