Make --wait-for-debugger work for mandoline launcher process.

mojo/runner/child_process_host.cc

 // Copyright 2014 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/runner/child_process_host.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
-#include "base/stl_util.h"
-#include "base/strings/string_split.h"
 #include "base/task_runner.h"
 #include "base/task_runner_util.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/runner/context.h"
 #include "mojo/runner/switches.h"
 #include "mojo/runner/task_runners.h"
 #include "ui/gl/gl_switches.h"
 
 namespace mojo {
@@ skipping 67 matching lines @@
     return;
   }
 }
 
 bool ChildProcessHost::DoLaunch() {
   static const char* kForwardSwitches[] = {
       switches::kOverrideUseGLWithOSMesaForTests,
       switches::kTraceToConsole,
       switches::kV,
       switches::kVModule,
+      switches::kWaitForDebugger,
   };
 
   const base::CommandLine* parent_command_line =
       base::CommandLine::ForCurrentProcess();
   base::CommandLine child_command_line(parent_command_line->GetProgram());
   child_command_line.CopySwitchesFrom(*parent_command_line, kForwardSwitches,
                                       arraysize(kForwardSwitches));
   child_command_line.AppendSwitchASCII(switches::kApp, name_);
   child_command_line.AppendSwitch(switches::kChildProcess);
-  if (parent_command_line->HasSwitch(switches::kWaitForDebugger)) {
-    std::vector<std::string> apps_to_debug;
-    base::SplitString(
-        parent_command_line->GetSwitchValueASCII(switches::kWaitForDebugger),
-        ',', &apps_to_debug);
-    if (apps_to_debug.empty() || ContainsValue(apps_to_debug, name_))
-      child_command_line.AppendSwitch(switches::kWaitForDebugger);
-  }
 
   auto args = parent_command_line->GetArgs();
   for (const auto& arg : args)
     child_command_line.AppendArgNative(arg);
 
   embedder::HandlePassingInformation handle_passing_info;
   platform_channel_pair_.PrepareToPassClientHandleToChildProcess(
       &child_command_line, &handle_passing_info);
 
   base::LaunchOptions options;
@@ skipping 22 matching lines @@
 
 void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) {
   DVLOG(2) << "AppChildProcessHost::DidCreateChannel()";
 
   CHECK(channel_info);
   channel_info_ = channel_info;
 }
 
 }  // namespace runner
 }  // namespace mojo