Revert of Enable multiprocess by default on desktop mojo_runner.

mojo/runner/desktop/launcher_process.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 <stdio.h>
 #include <string.h>
 
 #include <algorithm>
 #include <iostream>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/trace_event/trace_event.h"
 #include "components/tracing/trace_config_file.h"
 #include "components/tracing/tracing_switches.h"
 #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");
   }
 
   // We want the shell::Context to outlive the MessageLoop so that pipes are
   // all gracefully closed / error-out before we try to shut the Context down.
   base::FilePath shell_dir;
   PathService::Get(base::DIR_MODULE, &shell_dir);
   Context shell_context(shell_dir, &tracer);
   {
     base::MessageLoop message_loop;
@@ skipping 10 matching lines @@
 
     // Must be called before |message_loop| is destroyed.
     shell_context.Shutdown();
   }
 
   return 0;
 }
 
 }  // namespace runner
 }  // namespace mojo