Move shell service to toplevel shell namespace

services/shell/runner/host/in_process_native_runner.h

Index: services/shell/runner/host/in_process_native_runner.h
diff --git a/services/shell/runner/host/in_process_native_runner.h b/services/shell/runner/host/in_process_native_runner.h
index 13b59fe2a5a3629300240f2d995055218596a459..8b1af2636b06d80f4f0118df65dde7d0060058fd 100644
--- a/services/shell/runner/host/in_process_native_runner.h
+++ b/services/shell/runner/host/in_process_native_runner.h
@@ -5,10 +5,11 @@
 #ifndef SERVICES_SHELL_RUNNER_HOST_IN_PROCESS_NATIVE_RUNNER_H_
 #define SERVICES_SHELL_RUNNER_HOST_IN_PROCESS_NATIVE_RUNNER_H_
 
+#include <memory>
+
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/scoped_native_library.h"
 #include "base/threading/simple_thread.h"
 #include "services/shell/native_runner.h"
@@ -18,7 +19,6 @@ namespace base {
 class TaskRunner;
 }
 
-namespace mojo {
 namespace shell {
 
 // An implementation of |NativeRunner| that loads/runs the given app (from the
@@ -42,11 +42,11 @@ class InProcessNativeRunner : public NativeRunner,
   void Run() override;
 
   base::FilePath app_path_;
-  InterfaceRequest<mojom::ShellClient> request_;
+  mojom::ShellClientRequest request_;
   base::Callback<bool(void)> app_completed_callback_runner_;
 
   base::ScopedNativeLibrary app_library_;
-  scoped_ptr<base::DelegateSimpleThread> thread_;
+  std::unique_ptr<base::DelegateSimpleThread> thread_;
 
   DISALLOW_COPY_AND_ASSIGN(InProcessNativeRunner);
 };
@@ -57,7 +57,7 @@ class InProcessNativeRunnerFactory : public NativeRunnerFactory {
       : launch_process_runner_(launch_process_runner) {}
   ~InProcessNativeRunnerFactory() override {}
 
-  scoped_ptr<NativeRunner> Create(const base::FilePath& app_path) override;
+  std::unique_ptr<NativeRunner> Create(const base::FilePath& app_path) override;
 
  private:
   base::TaskRunner* const launch_process_runner_;
@@ -66,6 +66,5 @@ class InProcessNativeRunnerFactory : public NativeRunnerFactory {
 };
 
 }  // namespace shell
-}  // namespace mojo
 
 #endif  // SERVICES_SHELL_RUNNER_HOST_IN_PROCESS_NATIVE_RUNNER_H_