diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/child_process_launcher.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/chrome/browser/child_process_launcher.cc b/chrome/browser/child_process_launcher.cc index ff555fe..206d8a7 100644 --- a/chrome/browser/child_process_launcher.cc +++ b/chrome/browser/child_process_launcher.cc @@ -312,8 +312,6 @@ bool ChildProcessLauncher::DidProcessCrash() { // DidProcessCrash called waitpid with WNOHANG, it'll reap the process. // However, if DidProcessCrash didn't reap the child, we'll need to in // Terminate via ProcessWatcher. So we can't close the handle here. - // - // This is moot on Windows where |child_exited| will always be true. if (child_exited) context_->process_.Close(); diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 1e3bcff..2648b3e 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -118,10 +118,8 @@ void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) { } bool NaClProcessHost::DidChildCrash() { - if (running_on_wow64_) { - bool child_exited; - return base::DidProcessCrash(&child_exited, handle()); - } + if (running_on_wow64_) + return base::DidProcessCrash(NULL, handle()); return ChildProcessHost::DidChildCrash(); } |