Move shell service to toplevel shell namespace

services/shell/runner/host/in_process_native_runner.cc

 // Copyright 2014 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/runner/host/in_process_native_runner.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/platform_thread.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/shell/runner/host/native_application_support.h"
 #include "services/shell/runner/host/out_of_process_native_runner.h"
 #include "services/shell/runner/init.h"
 
-namespace mojo {
 namespace shell {
 
 InProcessNativeRunner::InProcessNativeRunner() : app_library_(nullptr) {}
 
 InProcessNativeRunner::~InProcessNativeRunner() {
   // It is important to let the thread exit before unloading the DSO (when
   // app_library_ is destructed), because the library may have registered
   // thread-local data and destructors to run on thread termination.
   if (thread_) {
     DCHECK(thread_->HasBeenStarted());
@@ skipping 42 matching lines @@
   // This hangs on Windows in the component build, so skip it since it's
   // unnecessary.
 #if !(defined(COMPONENT_BUILD) && defined(OS_WIN))
   CallLibraryEarlyInitialization(app_library);
 #endif
   RunNativeApplication(app_library, std::move(request_));
   app_completed_callback_runner_.Run();
   app_completed_callback_runner_.Reset();
 }
 
-scoped_ptr<NativeRunner> InProcessNativeRunnerFactory::Create(
+std::unique_ptr<NativeRunner> InProcessNativeRunnerFactory::Create(
     const base::FilePath& app_path) {
   // Non-Mojo apps are always run in a new process.
   if (!app_path.MatchesExtension(FILE_PATH_LITERAL(".mojo"))) {
-    return make_scoped_ptr(
+    return base::WrapUnique(
         new OutOfProcessNativeRunner(launch_process_runner_, nullptr));
   }
-  return make_scoped_ptr(new InProcessNativeRunner);
+  return base::WrapUnique(new InProcessNativeRunner);
 }
 
 }  // namespace shell
-}  // namespace mojo