Move shell service to toplevel shell namespace

services/shell/background/background_shell.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_BACKGROUND_BACKGROUND_SHELL_H_
 #define SERVICES_SHELL_BACKGROUND_BACKGROUND_SHELL_H_
 
+#include <memory>
 #include <vector>
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/catalog/store.h"
 #include "services/shell/public/interfaces/shell_client.mojom.h"
 
 namespace catalog {
 class Store;
 }
 
-namespace mojo {
 namespace shell {
 
 class NativeRunnerDelegate;
 class Shell;
 
 // BackgroundShell starts up the mojo shell on a background thread, and
 // destroys the thread in the destructor. Once created use CreateApplication()
 // to obtain an InterfaceRequest for the Application. The InterfaceRequest can
 // then be bound to an ApplicationImpl.
 class BackgroundShell {
  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;
   };
 
   BackgroundShell();
   ~BackgroundShell();
 
   // Starts the background shell. |command_line_switches| are additional
   // switches applied to any processes spawned by this call.
-  void Init(scoped_ptr<InitParams> init_params);
+  void Init(std::unique_ptr<InitParams> init_params);
 
   // Obtains an InterfaceRequest for the specified name.
   mojom::ShellClientRequest CreateShellClientRequest(
       const std::string& name);
 
   // Use to do processing on the thread running the shell. The callback is
   // supplied a pointer to the Shell. The callback does *not* own the Shell.
   using ShellThreadCallback = base::Callback<void(Shell*)>;
   void ExecuteOnShellThread(const ShellThreadCallback& callback);
 
  private:
   class MojoThread;
 
-  scoped_ptr<MojoThread> thread_;
+  std::unique_ptr<MojoThread> thread_;
 
   DISALLOW_COPY_AND_ASSIGN(BackgroundShell);
 };
 
 }  // namespace shell
-}  // namespace mojo
 
 #endif  // SERVICES_SHELL_BACKGROUND_BACKGROUND_SHELL_H_