Makes wait-for-debugger=content_browser work for mash

services/service_manager/runner/host/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 "services/service_manager/runner/host/child_process_host.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 63 matching lines @@
   DCHECK(!child_process_.IsValid());
 
   const base::CommandLine& parent_command_line =
       *base::CommandLine::ForCurrentProcess();
 
   std::unique_ptr<base::CommandLine> child_command_line(
       new base::CommandLine(service_path_));
 
   child_command_line->AppendArguments(parent_command_line, false);
 
+  child_command_line->AppendSwitchASCII(::switches::kProcessServiceName,
+                                        target.name());
 #ifndef NDEBUG
-  child_command_line->AppendSwitchASCII("n", target.name());
   child_command_line->AppendSwitchASCII("u", target.user_id());
 #endif
 
   if (start_sandboxed_)
     child_command_line->AppendSwitch(::switches::kEnableSandbox);
 
   mojo_ipc_channel_.reset(new mojo::edk::PlatformChannelPair);
   mojo_ipc_channel_->PrepareToPassClientHandleToChildProcess(
       child_command_line.get(), &handle_passing_info_);
 
@@ skipping 127 matching lines @@
           child_process_.Handle(),
           mojo::edk::ScopedPlatformHandle(mojo::edk::PlatformHandle(
               mojo_ipc_channel_->PassServerHandle().release().handle)),
           child_token_);
     }
   }
   start_child_process_event_.Signal();
 }
 
 }  // namespace service_manager