Move mojo/runner to mojo/shell/standalone

mojo/shell/standalone/android/main.cc

 // Copyright 2013 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 "mojo/runner/android/main.h"
+#include "mojo/shell/standalone/android/main.h"
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #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 {
 
 // Command line argument for the communication fifo.
 const char kFifoPath[] = "fifo-path";
 
 LazyInstance<scoped_ptr<base::MessageLoop>> g_java_message_loop =
     LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<scoped_ptr<Context>> g_context = LAZY_INSTANCE_INITIALIZER;
@@ skipping 29 matching lines @@
 void InitializeRedirection() {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(kFifoPath))
     return;
 
   base::FilePath fifo_path =
       base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(kFifoPath);
   base::FilePath directory = fifo_path.DirName();
   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)
       << "Unable to redirect stderr to stdout.";
 }
 
 }  // namespace
 
 static void Init(JNIEnv* env,
                  const JavaParamRef<jclass>& clazz,
@@ skipping 12 matching lines @@
   DCHECK_EQ(return_value, 0);
 
   std::vector<std::string> parameters;
   parameters.push_back(
       base::android::ConvertJavaStringToUTF8(env, mojo_shell_path));
   base::android::AppendJavaStringArrayToStringVector(env, jparameters,
                                                      &parameters);
   base::CommandLine::Init(0, nullptr);
   base::CommandLine::ForCurrentProcess()->InitFromArgv(parameters);
 
-  mojo::shell::InitializeLogging();
-  mojo::shell::WaitForDebuggerIfNecessary();
+  InitializeLogging();
+  WaitForDebuggerIfNecessary();
 
   InitializeRedirection();
 
   // We want ~MessageLoop to happen prior to ~Context. Initializing
   // LazyInstances is akin to stack-allocating objects; their destructors
   // will be invoked first-in-last-out.
   base::FilePath shell_file_root(
       base::android::ConvertJavaStringToUTF8(env, j_local_apps_directory));
   Context* shell_context = new Context;
   g_context.Get().reset(shell_context);
@@ skipping 34 matching lines @@
 }
 
 bool RegisterShellMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 Context* GetContext() {
   return g_context.Get().get();
 }
 
-}  // namespace runner
+}  // namespace shell
 }  // namespace mojo
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
 
   mojo::shell::InitializeLogging();
   return mojo::shell::ChildProcessMain();
 }