Move shell service to toplevel shell namespace

services/shell/public/cpp/shell_test.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_PUBLIC_CPP_SHELL_TEST_H_
 #define SERVICES_SHELL_PUBLIC_CPP_SHELL_TEST_H_
 
+#include <memory>
+
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/cpp/shell_connection.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 class MessageLoop;
 }
 
-namespace mojo {
 namespace shell {
+
 class BackgroundShell;
-}
+
 namespace test {
 
 class ShellTest;
 
 // A default implementation of ShellClient for use in ShellTests. Tests wishing
 // to customize this should subclass this class instead of ShellClient,
 // otherwise they will have to call ShellTest::InitializeCalled() to forward
 // metadata from Initialize() to the test.
-class ShellTestClient : public mojo::ShellClient {
+class ShellTestClient : public ShellClient {
  public:
   explicit ShellTestClient(ShellTest* test);
   ~ShellTestClient() override;
 
  protected:
   void Initialize(Connector* connector,
                   const Identity& identity,
                   uint32_t id) override;
 
  private:
@@ skipping 20 matching lines @@
 
   // Instance information received from the Shell during Initialize().
   const std::string& test_name() const { return initialize_name_; }
   const std::string& test_userid() const { return initialize_userid_; }
   uint32_t test_instance_id() const { return initialize_instance_id_; }
 
   // By default, creates a simple ShellClient that captures the metadata sent
   // via Initialize(). Override to customize, but custom implementations must
   // call InitializeCalled() to forward the metadata so test_name() etc all
   // work.
-  virtual scoped_ptr<ShellClient> CreateShellClient();
+  virtual std::unique_ptr<ShellClient> CreateShellClient();
 
-  virtual scoped_ptr<base::MessageLoop> CreateMessageLoop();
+  virtual std::unique_ptr<base::MessageLoop> CreateMessageLoop();
 
   // Call to set Initialize() metadata when GetShellClient() is overridden.
   void InitializeCalled(Connector* connector,
                         const std::string& name,
                         const std::string& userid,
                         uint32_t id);
 
   // testing::Test:
   void SetUp() override;
   void TearDown() override;
 
  private:
   friend ShellTestClient;
 
-  scoped_ptr<ShellClient> shell_client_;
+  std::unique_ptr<ShellClient> shell_client_;
 
-  scoped_ptr<base::MessageLoop> message_loop_;
-  scoped_ptr<shell::BackgroundShell> background_shell_;
-  scoped_ptr<ShellConnection> shell_connection_;
+  std::unique_ptr<base::MessageLoop> message_loop_;
+  std::unique_ptr<BackgroundShell> background_shell_;
+  std::unique_ptr<ShellConnection> shell_connection_;
 
   // See constructor.
   std::string test_name_;
 
   Connector* connector_ = nullptr;
   std::string initialize_name_;
   std::string initialize_userid_ = shell::mojom::kInheritUserID;
   uint32_t initialize_instance_id_ = shell::mojom::kInvalidInstanceID;
 
   base::Closure initialize_called_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellTest);
 };
 
 }  // namespace test
-}  // namespace mojo
+}  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_SHELL_TEST_H_