[GTTF] Add an always-working timeout for browser_tests.

This one is implemented in the out-of-process launcher, so it's guaranteed
to work.

Not removing the MessageLoop delayed task sent inside the test because
currently not all browser tests use the launcher (sync tests?).

TEST=browser_tests
BUG=38053

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

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

1 files changed, 12 insertions, 5 deletions

diff --git a/chrome/test/test_launcher/out_of_proc_test_runner.cc b/chrome/test/test_launcher/out_of_proc_test_runner.cc
index 98bdeca..4d929a9 100644
--- a/chrome/test/test_launcher/out_of_proc_test_runner.cc
+++ b/chrome/test/test_launcher/out_of_proc_test_runner.cc
@@ -24,6 +24,8 @@ const char kSingleProcessAltFlag[]   = "single_process";
 const char kChildProcessFlag[]   = "child";
 const char kHelpFlag[]   = "help";
 
+const int64 kTestTimeoutMs = 30000;
+
 class OutOfProcTestRunner : public tests::TestRunner {
  public:
   OutOfProcTestRunner() {
@@ -53,14 +55,19 @@ class OutOfProcTestRunner : public tests::TestRunner {
     new_cmd_line.AppendSwitch(kChildProcessFlag);
 
     base::ProcessHandle process_handle;
-    bool r = base::LaunchApp(new_cmd_line, false, false, &process_handle);
-    if (!r)
+    if (!base::LaunchApp(new_cmd_line, false, false, &process_handle))
       return false;
 
     int exit_code = 0;
-    r = base::WaitForExitCode(process_handle, &exit_code);
-    if (!r)
-      return false;
+    if (!base::WaitForExitCodeWithTimeout(process_handle, &exit_code,
+                                          kTestTimeoutMs)) {
+      LOG(ERROR) << "Test timeout exceeded!";
+
+      exit_code = -1;  // Set a non-zero exit code to signal a failure.
+
+      // Ensure that the process terminates.
+      base::KillProcess(process_handle, -1, true);
+    }
 
     return exit_code == 0;
   }