Revert 80472 - GTTF: Detect browser crashes on shutdown in UI tests.Previously the automation fra...

base/process_util_posix.cc

 // Copyright (c) 2011 The Chromium 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 <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/resource.h>
@@ skipping 706 matching lines @@
 
 bool WaitForExitCodeWithTimeout(ProcessHandle handle, int* exit_code,
                                 int64 timeout_milliseconds) {
   bool waitpid_success = false;
   int status = WaitpidWithTimeout(handle, timeout_milliseconds,
                                   &waitpid_success);
   if (status == -1)
     return false;
   if (!waitpid_success)
     return false;
+  if (!WIFEXITED(status))
+    return false;
   if (WIFSIGNALED(status)) {
     *exit_code = -1;
     return true;
   }
-  if (WIFEXITED(status)) {
-    *exit_code = WEXITSTATUS(status);
-    return true;
-  }
-  return false;
+  *exit_code = WEXITSTATUS(status);
+  return true;
 }
 
 #if defined(OS_MACOSX)
 // Using kqueue on Mac so that we can wait on non-child processes.
 // We can't use kqueues on child processes because we need to reap
 // our own children using wait.
 static bool WaitForSingleNonChildProcess(ProcessHandle handle,
                                          int64 wait_milliseconds) {
   int kq = kqueue();
   if (kq == -1) {
@@ skipping 69 matching lines @@
   else
     status = WaitpidWithTimeout(handle, wait_milliseconds, &waitpid_success);
   if (status != -1) {
     DCHECK(waitpid_success);
     return WIFEXITED(status);
   } else {
     return false;
   }
 }
 
+bool CrashAwareSleep(ProcessHandle handle, int64 wait_milliseconds) {
+  bool waitpid_success;
+  int status = WaitpidWithTimeout(handle, wait_milliseconds, &waitpid_success);
+  if (status != -1) {
+    DCHECK(waitpid_success);
+    return !(WIFEXITED(status) || WIFSIGNALED(status));
+  } else {
+    // If waitpid returned with an error, then the process doesn't exist
+    // (which most probably means it didn't exist before our call).
+    return waitpid_success;
+  }
+}
+
 int64 TimeValToMicroseconds(const struct timeval& tv) {
   static const int kMicrosecondsPerSecond = 1000000;
   int64 ret = tv.tv_sec;  // Avoid (int * int) integer overflow.
   ret *= kMicrosecondsPerSecond;
   ret += tv.tv_usec;
   return ret;
 }
 
 // Executes the application specified by |cl| and wait for it to exit. Stores
 // the output (stdout) in |output|. If |do_search_path| is set, it searches the
@@ skipping 151 matching lines @@
                       const ProcessFilter* filter) {
   bool exited_cleanly =
       WaitForProcessesToExit(executable_name, wait_milliseconds,
                              filter);
   if (!exited_cleanly)
     KillProcesses(executable_name, exit_code, filter);
   return exited_cleanly;
 }
 
 }  // namespace base