Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/context.h

Index: mojo/shell/standalone/context.h
diff --git a/mojo/runner/context.h b/mojo/shell/standalone/context.h
similarity index 79%
rename from mojo/runner/context.h
rename to mojo/shell/standalone/context.h
index 2db71887c34f34ae4fd1bd6c7f5b5a65b14075f7..1a39cfc60c059dc016854b0a5cef7de0f55a318e 100644
--- a/mojo/runner/context.h
+++ b/mojo/shell/standalone/context.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_RUNNER_CONTEXT_H_
-#define MOJO_RUNNER_CONTEXT_H_
+#ifndef MOJO_SHELL_STANDALONE_CONTEXT_H_
+#define MOJO_SHELL_STANDALONE_CONTEXT_H_
 
 #include <set>
 #include <string>
@@ -11,24 +11,21 @@
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/time/time.h"
-#include "mojo/runner/scoped_user_data_dir.h"
-#include "mojo/runner/task_runners.h"
-#include "mojo/runner/tracer.h"
 #include "mojo/shell/application_manager.h"
+#include "mojo/shell/standalone/scoped_user_data_dir.h"
+#include "mojo/shell/standalone/task_runners.h"
+#include "mojo/shell/standalone/tracer.h"
 #include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
-class PackageManagerImpl;
-}
-namespace runner {
-
 class NativeApplicationLoader;
+class PackageManagerImpl;
 
 // The "global" context for the shell's main process.
 // TODO(use_chrome_edk)
-//class Context : public edk::ProcessDelegate {
+// class Context : public edk::ProcessDelegate {
 class Context : public embedder::ProcessDelegate {
  public:
   Context();
@@ -54,11 +51,11 @@ class Context : public embedder::ProcessDelegate {
   void RunCommandLineApplication(const base::Closure& callback);
 
   TaskRunners* task_runners() { return task_runners_.get(); }
-  shell::ApplicationManager* application_manager() {
+  ApplicationManager* application_manager() {
     return application_manager_.get();
   }
 
-  shell::PackageManagerImpl* package_manager() { return package_manager_; }
+  PackageManagerImpl* package_manager() { return package_manager_; }
 
  private:
   class NativeViewportApplicationLoader;
@@ -75,15 +72,15 @@ class Context : public embedder::ProcessDelegate {
   // that needs the IO thread to destruct cleanly.
   Tracer tracer_;
   // Owned by |application_manager_|.
-  shell::PackageManagerImpl* package_manager_;
-  scoped_ptr<shell::ApplicationManager> application_manager_;
+  PackageManagerImpl* package_manager_;
+  scoped_ptr<ApplicationManager> application_manager_;
   base::Closure app_complete_callback_;
   base::Time main_entry_time_;
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
-}  // namespace runner
+}  // namespace shell
 }  // namespace mojo
 
-#endif  // MOJO_RUNNER_CONTEXT_H_
+#endif  // MOJO_SHELL_STANDALONE_CONTEXT_H_