Move shell service to toplevel shell namespace

services/shell/public/cpp/application_runner.h

 // 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.
 
 #ifndef SERVICES_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_H_
 #define SERVICES_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_H_
 
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/system/core.h"
 
-namespace mojo {
+namespace shell {
 
 class ShellClient;
 class ShellConnection;
 
 // A utility for running a chromium based mojo Application. The typical use
 // case is to use when writing your MojoMain:
 //
 //  MojoResult MojoMain(MojoHandle shell_handle) {
-//    mojo::ApplicationRunner runner(new MyDelegate());
+//    shell::ApplicationRunner runner(new MyDelegate());
 //    return runner.Run(shell_handle);
 //  }
 //
 // ApplicationRunner takes care of chromium environment initialization and
 // shutdown, and starting a MessageLoop from which your application can run and
 // ultimately Quit().
 class ApplicationRunner {
  public:
   // Takes ownership of |client|.
   explicit ApplicationRunner(ShellClient* client);
@@ skipping 19 matching lines @@
   // shell notices the pipe has closed, it will no longer track an instance of
   // this application, though this application may continue to run and service
   // requests from others.
   void DestroyShellConnection();
 
   // Allows the caller to explicitly quit the application. Must be called from
   // the thread which created the ApplicationRunner.
   void Quit();
 
  private:
-  scoped_ptr<ShellConnection> connection_;
-  scoped_ptr<ShellClient> client_;
+  std::unique_ptr<ShellConnection> connection_;
+  std::unique_ptr<ShellClient> client_;
 
   // MessageLoop type. TYPE_CUSTOM is default (MessagePumpMojo will be used as
   // the underlying message pump).
   base::MessageLoop::Type message_loop_type_;
   // Whether Run() has been called.
   bool has_run_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationRunner);
 };
 
-}  // namespace mojo
+}  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_APPLICATION_RUNNER_H_