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

-no need to map kiosk_wm to window_manager, instead, make kiosk_wm's binary output be window_manager.mojom
-no need for app-specific args, instead use base::CommandLine. This is important for Mandoline since we'll be sharing code with Chrome which does use these flags.
-mojo_shell url is enough to start a browser now

Review URL: https://codereview.chromium.org/1057603003

Cr-Commit-Position: refs/heads/master@{#324579}

1 files changed, 2 insertions, 9 deletions

diff --git a/mojo/shell/android/main.cc b/mojo/shell/android/main.cc
index 41c507a..9caf840 100644
--- a/mojo/shell/android/main.cc
+++ b/mojo/shell/android/main.cc
@@ -26,7 +26,6 @@
 #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"
@@ -46,15 +45,12 @@ const char kFifoPath[] = "fifo-path";
 
 class MojoShellRunner : public base::DelegateSimpleThread::Delegate {
  public:
-  MojoShellRunner(const std::vector<std::string>& parameters)
-      : parameters_(parameters) {}
+  MojoShellRunner(const std::vector<std::string>& parameters) {}
   ~MojoShellRunner() override {}
 
  private:
   void Run() override;
 
-  std::vector<std::string> parameters_;
-
   DISALLOW_COPY_AND_ASSIGN(MojoShellRunner);
 };
 
@@ -107,10 +103,7 @@ void MojoShellRunner::Run() {
   ConfigureAndroidServices(context);
   context->Init();
 
-  for (auto& args : parameters_)
-    ApplyApplicationArgs(context, args);
-
-  RunCommandLineApps(context);
+  context->Run(GURL("mojo:window_manager"));
   loop.Run();
 
   g_java_message_loop.Pointer()->get()->PostTask(FROM_HERE,