The worker process launcher can now ask the worker to crash.

remoting/host/desktop_session_win.cc

 // Copyright (c) 2012 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 "remoting/host/desktop_session_win.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "ipc/ipc_message_macros.h"
@@ skipping 46 matching lines @@
 }
 
 void DesktopSessionWin::OnChannelConnected(int32 peer_pid) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   // Obtain the handle of the desktop process. It will be passed to the network
   // process so it would be able to duplicate handles of shared memory objects
   // from the desktop process.
   desktop_process_.Set(OpenProcess(PROCESS_DUP_HANDLE, false, peer_pid));
   if (!desktop_process_.IsValid()) {
-    RestartDesktopProcess(FROM_HERE);
+    CrashDesktopProcess(FROM_HERE);
     return;
   }
 
   VLOG(1) << "IPC: daemon <- desktop (" << peer_pid << ")";
 }
 
 bool DesktopSessionWin::OnMessageReceived(const IPC::Message& message) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(DesktopSessionWin, message)
     IPC_MESSAGE_HANDLER(ChromotingDesktopDaemonMsg_DesktopAttached,
                         OnDesktopSessionAgentAttached)
     IPC_MESSAGE_HANDLER(ChromotingDesktopDaemonMsg_InjectSas,
                         OnInjectSas)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   if (!handled) {
     LOG(ERROR) << "Received unexpected IPC type: " << message.type();
-    RestartDesktopProcess(FROM_HERE);
+    CrashDesktopProcess(FROM_HERE);
   }
 
   return handled;
 }
 
 void DesktopSessionWin::OnPermanentError() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   launcher_.reset();
 
@@ skipping 34 matching lines @@
   DCHECK(launcher_.get() != NULL);
 
   launcher_.reset();
 }
 
 void DesktopSessionWin::OnDesktopSessionAgentAttached(
       IPC::PlatformFileForTransit desktop_pipe) {
   if (!daemon_process()->OnDesktopSessionAgentAttached(id(),
                                                        desktop_process_,
                                                        desktop_pipe)) {
-    RestartDesktopProcess(FROM_HERE);
+    CrashDesktopProcess(FROM_HERE);
   }
 }
 
 void DesktopSessionWin::OnInjectSas() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
   // Do not try to inject SAS if the desktop process is not running. This can
   // happen when  the session has detached from the console for instance.
   if (!launcher_)
     return;
 
   if (!sas_injector_)
     sas_injector_ = SasInjector::Create();
   if (!sas_injector_->InjectSas())
     LOG(ERROR) << "Failed to inject Secure Attention Sequence.";
 }
 
-void DesktopSessionWin::RestartDesktopProcess(
+void DesktopSessionWin::CrashDesktopProcess(
     const tracked_objects::Location& location) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 
-  launcher_->Send(new ChromotingDaemonDesktopMsg_Crash(
-      location.function_name(), location.file_name(), location.line_number()));
+  launcher_->Crash(location);
 }
 
 }  // namespace remoting