Revert of Simplify mojo_shell since it's now only used for Mandoline.

mojo/shell/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/shell/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/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 "base/threading/simple_thread.h"
 #include "jni/ShellMain_jni.h"
 #include "mojo/common/message_pump_mojo.h"
 #include "mojo/shell/android/android_handler_loader.h"
 #include "mojo/shell/android/background_application_loader.h"
 #include "mojo/shell/android/native_viewport_application_loader.h"
 #include "mojo/shell/android/ui_application_loader_android.h"
 #include "mojo/shell/application_manager/application_loader.h"
+#include "mojo/shell/command_line_util.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/init.h"
 #include "ui/gl/gl_surface_egl.h"
 
 using base::LazyInstance;
 
 namespace mojo {
 namespace shell {
 
 namespace {
 
 // Tag for logging.
 const char kLogTag[] = "chromium";
 
 // Command line argument for the communication fifo.
 const char kFifoPath[] = "fifo-path";
 
 class MojoShellRunner : public base::DelegateSimpleThread::Delegate {
  public:
-  MojoShellRunner(const std::vector<std::string>& parameters) {}
+  MojoShellRunner(const std::vector<std::string>& parameters)
+      : parameters_(parameters) {}
   ~MojoShellRunner() override {}
 
  private:
   void Run() override;
 
+  std::vector<std::string> parameters_;
+
   DISALLOW_COPY_AND_ASSIGN(MojoShellRunner);
 };
 
 LazyInstance<scoped_ptr<base::MessageLoop>> g_java_message_loop =
     LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<scoped_ptr<Context>> g_context = LAZY_INSTANCE_INITIALIZER;
 
 LazyInstance<scoped_ptr<MojoShellRunner>> g_shell_runner =
     LAZY_INSTANCE_INITIALIZER;
@@ skipping 32 matching lines @@
                                 g_main_activiy.Get().obj());
   exit(0);
 }
 
 void MojoShellRunner::Run() {
   base::MessageLoop loop(common::MessagePumpMojo::Create());
   Context* context = g_context.Pointer()->get();
   ConfigureAndroidServices(context);
   context->Init();
 
-  context->Run(GURL("mojo:window_manager"));
+  for (auto& args : parameters_)
+    ApplyApplicationArgs(context, args);
+
+  RunCommandLineApps(context);
   loop.Run();
 
   g_java_message_loop.Pointer()->get()->PostTask(FROM_HERE,
                                                  base::Bind(&QuitShellThread));
 }
 
 // Initialize stdout redirection if the command line switch is present.
 void InitializeRedirection() {
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(kFifoPath))
     return;
@@ skipping 89 matching lines @@
 }
 
 }  // namespace shell
 }  // namespace mojo
 
 // TODO(vtl): Even though main() should never be called, mojo_shell fails to
 // link without it. Figure out if we can avoid this.
 int main(int argc, char** argv) {
   NOTREACHED();
 }