Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/android/main.cc

Index: mojo/shell/standalone/android/main.cc
diff --git a/mojo/runner/android/main.cc b/mojo/shell/standalone/android/main.cc
similarity index 91%
rename from mojo/runner/android/main.cc
rename to mojo/shell/standalone/android/main.cc
index 229c690636ac06f5e344b763399444a724d7367d..9fffd84ee6c825d772fb0b4954026af8e597cbbc 100644
--- a/mojo/runner/android/main.cc
+++ b/mojo/shell/standalone/android/main.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/runner/android/main.h"
+#include "mojo/shell/standalone/android/main.h"
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
@@ -23,20 +23,20 @@
 #include "components/mus/android_loader.h"
 #include "jni/ShellMain_jni.h"
 #include "mojo/message_pump/message_pump_mojo.h"
-#include "mojo/runner/android/android_handler_loader.h"
-#include "mojo/runner/android/background_application_loader.h"
-#include "mojo/runner/android/context_init.h"
-#include "mojo/runner/android/ui_application_loader_android.h"
-#include "mojo/runner/context.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/runner/host/child_process.h"
 #include "mojo/shell/runner/init.h"
+#include "mojo/shell/standalone/android/android_handler_loader.h"
+#include "mojo/shell/standalone/android/background_application_loader.h"
+#include "mojo/shell/standalone/android/context_init.h"
+#include "mojo/shell/standalone/android/ui_application_loader_android.h"
+#include "mojo/shell/standalone/context.h"
 #include "ui/gl/gl_surface_egl.h"
 
 using base::LazyInstance;
 
 namespace mojo {
-namespace runner {
+namespace shell {
 
 namespace {
 
@@ -86,8 +86,8 @@ void InitializeRedirection() {
   CHECK(base::CreateDirectoryAndGetError(directory, nullptr))
       << "Unable to create directory: " << directory.value();
   unlink(fifo_path.value().c_str());
-  CHECK(base::android::CreateFIFO(fifo_path, 0666))
-      << "Unable to create fifo: " << fifo_path.value();
+  CHECK(base::android::CreateFIFO(fifo_path, 0666)) << "Unable to create fifo: "
+                                                    << fifo_path.value();
   CHECK(base::android::RedirectStream(stdout, fifo_path, "w"))
       << "Failed to redirect stdout to file: " << fifo_path.value();
   CHECK(dup2(STDOUT_FILENO, STDERR_FILENO) != -1)
@@ -120,8 +120,8 @@ static void Init(JNIEnv* env,
   base::CommandLine::Init(0, nullptr);
   base::CommandLine::ForCurrentProcess()->InitFromArgv(parameters);
 
-  mojo::shell::InitializeLogging();
-  mojo::shell::WaitForDebuggerIfNecessary();
+  InitializeLogging();
+  WaitForDebuggerIfNecessary();
 
   InitializeRedirection();
 
@@ -176,7 +176,7 @@ Context* GetContext() {
   return g_context.Get().get();
 }
 
-}  // namespace runner
+}  // namespace shell
 }  // namespace mojo
 
 int main(int argc, char** argv) {