Move shell service to toplevel shell namespace

services/shell/public/cpp/lib/shell_test.cc

 // 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.
 
 #include "services/shell/public/cpp/shell_test.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "services/shell/background/background_shell.h"
 #include "services/shell/public/cpp/shell_client.h"
 
-namespace mojo {
+namespace shell {
 namespace test {
 
 ShellTestClient::ShellTestClient(ShellTest* test) : test_(test) {}
 ShellTestClient::~ShellTestClient() {}
 
 void ShellTestClient::Initialize(Connector* connector, const Identity& identity,
                                  uint32_t id) {
   test_->InitializeCalled(connector, identity.name(), identity.user_id(), id);
 }
 
 ShellTest::ShellTest() {}
 ShellTest::ShellTest(const std::string& test_name) : test_name_(test_name) {}
 ShellTest::~ShellTest() {}
 
 void ShellTest::InitTestName(const std::string& test_name) {
   DCHECK(test_name_.empty());
   test_name_ = test_name;
 }
 
-scoped_ptr<ShellClient> ShellTest::CreateShellClient() {
-  return make_scoped_ptr(new ShellTestClient(this));
+std::unique_ptr<ShellClient> ShellTest::CreateShellClient() {
+  return base::WrapUnique(new ShellTestClient(this));
 }
 
-scoped_ptr<base::MessageLoop> ShellTest::CreateMessageLoop() {
-  return make_scoped_ptr(new base::MessageLoop);
+std::unique_ptr<base::MessageLoop> ShellTest::CreateMessageLoop() {
+  return base::WrapUnique(new base::MessageLoop);
 }
 
 void ShellTest::InitializeCalled(Connector* connector,
                                  const std::string& name,
                                  const std::string& user_id,
                                  uint32_t id) {
   DCHECK_EQ(connector_, connector);
   initialize_name_ = name;
   initialize_instance_id_ = id;
   initialize_userid_ = user_id;
@@ skipping 22 matching lines @@
 }
 
 void ShellTest::TearDown() {
   shell_connection_.reset();
   background_shell_.reset();
   message_loop_.reset();
   shell_client_.reset();
 }
 
 }  // namespace test
-}  // namespace mojo
+}  // namespace shell