Make UITest::CrashAwareSleep portable.

Review URL: http://codereview.chromium.org/40119

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10916 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 20 insertions, 4 deletions

diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc
index e8845fb..453316d 100644
--- a/base/process_util_posix.cc
+++ b/base/process_util_posix.cc
@@ -182,7 +182,9 @@ bool WaitForExitCode(ProcessHandle handle, int* exit_code) {
   return false;
 }
 
-bool WaitForSingleProcess(ProcessHandle handle, int wait_milliseconds) {
+namespace {
+
+int WaitpidWithTimeout(ProcessHandle handle, int wait_milliseconds) {
   // This POSIX version of this function only guarantees that we wait no less
   // than |wait_milliseconds| for the proces to exit.  The child process may
   // exit sometime before the timeout has ended but we may still block for
@@ -228,11 +230,25 @@ bool WaitForSingleProcess(ProcessHandle handle, int wait_milliseconds) {
     ret_pid = waitpid(handle, &status, WNOHANG);
   }
 
-  if (status != -1) {
+  return status;
+}
+
+}  // namespace
+
+bool WaitForSingleProcess(ProcessHandle handle, int wait_milliseconds) {
+  int status = WaitpidWithTimeout(handle, wait_milliseconds);
+  if (status != -1)
     return WIFEXITED(status);
-  } else {
+  else
+    return false;
+}
+
+bool CrashAwareSleep(ProcessHandle handle, int wait_milliseconds) {
+  int status = WaitpidWithTimeout(handle, wait_milliseconds);
+  if (status != -1)
+    return !(WIFEXITED(status) || WIFSIGNALED(status));
+  else
     return false;
-  }
 }
 
 namespace {