NaCl repo side changes to make crash reporting more reliable.

src/trusted/nonnacl_util/win/sel_ldr_launcher_win.cc

 /*
  * Copyright 2008 The Native Client 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 <string.h>
 #include <windows.h>
 
 #include <vector>
 
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/include/portability.h"
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 
 // Use a predefined symbol to get a handle to the current module.
 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
 // @IGNORE_LINES_FOR_CODE_HYGIENE[1]
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 using std::vector;
 
 namespace nacl {
 
 SelLdrLauncher::~SelLdrLauncher() {
   CloseHandlesAfterLaunch();
   if (kInvalidHandle != child_process_) {
+    // Ensure child process (service runtime) is kaput.  NB: we might
+    // close the command channel (or use the hard_shutdown RPC) rather
+    // than killing the process to allow the service runtime to do
+    // clean up, but the plugin should be responsible for that and we
+    // shouldn't introduce any timeout wait in a dtor.  Currently,
+    // ServiceRuntime::Shutdown kills the subprocess before closing
+    // the command channel, so we aren't providing the opportunity for
+    // a more graceful shutdown.
+    KillChildProcess();
     CloseHandle(child_process_);
   }
   if (kInvalidHandle != channel_) {
     Close(channel_);
   }
 }
 
 nacl::string SelLdrLauncher::GetSelLdrPathName() {
   char buffer[FILENAME_MAX];
   // Currently only the Chrome build uses the gyp-generated binaries, and
@@ skipping 101 matching lines @@
   // NOTE: casting down to DWORD is safe the integer will become smaller
   //       at worst
   GetModuleFileNameA(this_module, buffer, static_cast<DWORD>(len));
   char* path_end = strrchr(buffer, '\\');
   if (NULL != path_end) {
     *path_end = '\0';
   }
 }
 
 }  // namespace nacl