diff options
Diffstat (limited to 'chrome/browser/nacl_host')
-rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.cc | 17 | ||||
-rw-r--r-- | chrome/browser/nacl_host/nacl_process_host.h | 3 |
2 files changed, 5 insertions, 15 deletions
diff --git a/chrome/browser/nacl_host/nacl_process_host.cc b/chrome/browser/nacl_host/nacl_process_host.cc index 0310e39..2648b3e 100644 --- a/chrome/browser/nacl_host/nacl_process_host.cc +++ b/chrome/browser/nacl_host/nacl_process_host.cc @@ -117,19 +117,10 @@ void NaClProcessHost::OnProcessLaunchedByBroker(base::ProcessHandle handle) { OnProcessLaunched(); } -void NaClProcessHost::DetermineDidChildCrash() { - // Either of these paths will lead to deleting this object in - // OnDidProcessCrashDetermined in ChildProcessHost, so they should be the - // last calls in this method. - if (running_on_wow64_) { - bool did_crash = base::DidProcessCrash(NULL, handle()); - OnDidProcessCrashDetermined(did_crash); - } else { - // Determine whether the process crashed or not. This method will invoke - // OnDidProcessCrashDetermined with the result. This may occur - // asynchronously. - ChildProcessHost::DetermineDidChildCrash(); - } +bool NaClProcessHost::DidChildCrash() { + if (running_on_wow64_) + return base::DidProcessCrash(NULL, handle()); + return ChildProcessHost::DidChildCrash(); } void NaClProcessHost::OnChildDied() { diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h index b6c3313..28893fc 100644 --- a/chrome/browser/nacl_host/nacl_process_host.h +++ b/chrome/browser/nacl_host/nacl_process_host.h @@ -36,8 +36,7 @@ class NaClProcessHost : public ChildProcessHost { void OnProcessLaunchedByBroker(base::ProcessHandle handle); protected: - // Override ChildProcessHost methods. - virtual void DetermineDidChildCrash(); + virtual bool DidChildCrash(); virtual void OnChildDied(); private: |