Revert of Enable multiprocess by default on desktop mojo_runner.

mojo/runner/desktop/launcher_process.cc

Index: mojo/runner/desktop/launcher_process.cc
diff --git a/mojo/runner/desktop/launcher_process.cc b/mojo/runner/desktop/launcher_process.cc
index 6ed5c0f77b154635fb549a3c33e3f95d4baf490a..fb2c896cb908377e7fd12e86c67a8b98ac33f99f 100644
--- a/mojo/runner/desktop/launcher_process.cc
+++ b/mojo/runner/desktop/launcher_process.cc
@@ -21,26 +21,20 @@
 #include "mojo/runner/context.h"
 #include "mojo/runner/switches.h"
 #include "mojo/runner/tracer.h"
-#include "mojo/shell/switches.h"
 
 namespace mojo {
 namespace runner {
 
 int LauncherProcessMain(int argc, char** argv) {
   mojo::runner::Tracer tracer;
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch(switches::kMojoSingleProcess) &&
-      !command_line->HasSwitch("gtest_list_tests"))
-    command_line->AppendSwitch(switches::kEnableMultiprocess);
-  command_line->AppendSwitch("use-new-edk");
-  // http://crbug.com/546644
-  command_line->AppendSwitch(switches::kMojoNoSandbox);
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
 
-  bool trace_startup = command_line->HasSwitch(switches::kTraceStartup);
+  bool trace_startup = command_line.HasSwitch(switches::kTraceStartup);
   if (trace_startup) {
     tracer.Start(
-        command_line->GetSwitchValueASCII(switches::kTraceStartup),
-        command_line->GetSwitchValueASCII(switches::kTraceStartupDuration),
+        command_line.GetSwitchValueASCII(switches::kTraceStartup),
+        command_line.GetSwitchValueASCII(switches::kTraceStartupDuration),
         "mandoline.trace");
   }