Move shell service to toplevel shell namespace

services/shell/standalone/context.h

Index: services/shell/standalone/context.h
diff --git a/services/shell/standalone/context.h b/services/shell/standalone/context.h
index eba6233b0ea858531ad49a8e7318a4b8d057eeed..9db0b424c78337d483692b2c651baa4fe7ad7b11 100644
--- a/services/shell/standalone/context.h
+++ b/services/shell/standalone/context.h
@@ -5,10 +5,11 @@
 #ifndef SERVICES_SHELL_STANDALONE_CONTEXT_H_
 #define SERVICES_SHELL_STANDALONE_CONTEXT_H_
 
+#include <memory>
+
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
 #include "mojo/edk/embedder/process_delegate.h"
@@ -24,19 +25,18 @@ class Factory;
 class Store;
 }
 
-namespace mojo {
 namespace shell {
 class NativeRunnerDelegate;
 
 // The "global" context for the shell's main process.
-class Context : public edk::ProcessDelegate {
+class Context : public mojo::edk::ProcessDelegate {
  public:
   struct InitParams {
     InitParams();
     ~InitParams();
 
     NativeRunnerDelegate* native_runner_delegate = nullptr;
-    scoped_ptr<catalog::Store> catalog_store;
+    std::unique_ptr<catalog::Store> catalog_store;
     // If true the edk is initialized.
     bool init_edk = true;
   };
@@ -48,7 +48,7 @@ class Context : public edk::ProcessDelegate {
 
   // This must be called with a message loop set up for the current thread,
   // which must remain alive until after Shutdown() is called.
-  void Init(scoped_ptr<InitParams> init_params);
+  void Init(std::unique_ptr<InitParams> init_params);
 
   // If Init() was called and succeeded, this must be called before destruction.
   void Shutdown();
@@ -59,21 +59,21 @@ class Context : public edk::ProcessDelegate {
   Shell* shell() { return shell_.get(); }
 
  private:
-  // edk::ProcessDelegate:
+  // mojo::edk::ProcessDelegate:
   void OnShutdownComplete() override;
 
   // Runs the app specified by |name|.
   void Run(const std::string& name);
 
   scoped_refptr<base::SingleThreadTaskRunner> shell_runner_;
-  scoped_ptr<base::Thread> io_thread_;
+  std::unique_ptr<base::Thread> io_thread_;
   scoped_refptr<base::SequencedWorkerPool> blocking_pool_;
 
   // Ensure this is destructed before task_runners_ since it owns a message pipe
   // that needs the IO thread to destruct cleanly.
   Tracer tracer_;
-  scoped_ptr<catalog::Factory> catalog_;
-  scoped_ptr<Shell> shell_;
+  std::unique_ptr<catalog::Factory> catalog_;
+  std::unique_ptr<Shell> shell_;
   base::Time main_entry_time_;
   bool init_edk_ = false;
 
@@ -81,6 +81,5 @@ class Context : public edk::ProcessDelegate {
 };
 
 }  // namespace shell
-}  // namespace mojo
 
 #endif  // SERVICES_SHELL_STANDALONE_CONTEXT_H_