summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 13:03:47 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-06 13:03:47 +0000
commite80bea9a23243ddf8f58c0358df8118159800b53 (patch)
tree43f7da3680f9b6045df619184d629e7347ca3c75 /chrome
parent9bf97140e3fb566cda9436a5f2ba33df01f21d6d (diff)
downloadchromium_src-e80bea9a23243ddf8f58c0358df8118159800b53.zip
chromium_src-e80bea9a23243ddf8f58c0358df8118159800b53.tar.gz
chromium_src-e80bea9a23243ddf8f58c0358df8118159800b53.tar.bz2
Make DidProcessCrash a bit more solid and accurate on Windows
I hit the NOTREACHED() inside it while debugging an unrelated problem. Also, now there is one less special case in this function's contract. TEST=none BUG=38048 Review URL: http://codereview.chromium.org/1315009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/child_process_launcher.cc2
-rw-r--r--chrome/browser/nacl_host/nacl_process_host.cc6
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();
}