Make Android Mojo Runner respect command line apps.

mandoline/app/desktop/launcher_process.cc

 // Copyright 2015 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 <stdio.h>
 #include <string.h>
 
 #include <algorithm>
 #include <iostream>
 
@@ skipping 58 matching lines @@
   // TraceLog::Flush requires a message loop but we've already shut ours down.
   // Spin up a new thread to flush things out.
   base::Thread flush_thread("mojo_shell_trace_event_flush");
   flush_thread.Start();
   flush_thread.message_loop()->PostTask(
       FROM_HERE,
       base::Bind(EndTraceAndFlush, base::Unretained(&flush_complete_event)));
   flush_complete_event.Wait();
 }
 
-void StartApp(mojo::runner::Context* context) {
-  // If a mojo app isn't specified (i.e. for an apptest), run the mojo shell's
-  // window manager.
-  GURL app_url(GURL("mojo:window_manager"));
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  base::CommandLine::StringVector args = command_line->GetArgs();
-  for (size_t i = 0; i < args.size(); ++i) {
-    GURL possible_app(args[i]);
-    if (possible_app.SchemeIs("mojo")) {
-      app_url = possible_app;
-      break;
-    }
-  }
-
-  context->Run(app_url);
-}
-
 }  // namespace
 
 int LauncherProcessMain(int argc, char** argv) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kTraceStartup)) {
     g_tracing = true;
     base::trace_event::CategoryFilter category_filter(
         command_line.GetSwitchValueASCII(switches::kTraceStartup));
     base::trace_event::TraceLog::GetInstance()->SetEnabled(
         category_filter, base::trace_event::TraceLog::RECORDING_MODE,
         base::trace_event::TraceOptions(base::trace_event::RECORD_UNTIL_FULL));
   }
 
   // We want the runner::Context to outlive the MessageLoop so that pipes are
   // all gracefully closed / error-out before we try to shut the Context down.
   mojo::runner::Context shell_context;
   InitCoreServicesForContext(&shell_context);
   {
     base::MessageLoop message_loop;
     if (!shell_context.Init()) {
       return 0;
     }
     if (g_tracing) {
       message_loop.PostDelayedTask(FROM_HERE,
                                    base::Bind(StopTracingAndFlushToDisk),
                                    base::TimeDelta::FromSeconds(5));
     }
 
-    message_loop.PostTask(FROM_HERE, base::Bind(&StartApp, &shell_context));
+    message_loop.PostTask(FROM_HERE,
+                          base::Bind(&mojo::runner::Context::Run,
+                                     base::Unretained(&shell_context),
+                                     GURL("mojo:window_manager")));
     message_loop.Run();
 
     // Must be called before |message_loop| is destroyed.
     shell_context.Shutdown();
   }
 
   if (g_tracing)
     StopTracingAndFlushToDisk();
   return 0;
 }
 
 }  // namespace mandoline