GTTF: Detect browser crashes on shutdown in UI tests.

chrome/browser/process_singleton_linux_uitest.cc

Index: chrome/browser/process_singleton_linux_uitest.cc
===================================================================
--- chrome/browser/process_singleton_linux_uitest.cc	(revision 80488)
+++ chrome/browser/process_singleton_linux_uitest.cc	(working copy)
@@ -171,7 +171,10 @@
             NotifyOtherProcess(url, TestTimeouts::action_timeout_ms()));
 
   // Wait for a while to make sure the browser process is actually killed.
-  EXPECT_FALSE(CrashAwareSleep(TestTimeouts::action_timeout_ms()));
+  int exit_code = 0;
+  ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(
+                  TestTimeouts::action_max_timeout_ms(), &exit_code));
+  EXPECT_EQ(-1, exit_code);  // Expect unclean shutdown.
 }
 
 // Test that we don't kill ourselves by accident if a lockfile with the same pid
@@ -225,7 +228,10 @@
   // Kill the browser process, so that it does not respond on the socket.
   kill(pid, SIGKILL);
   // Wait for a while to make sure the browser process is actually killed.
-  EXPECT_FALSE(CrashAwareSleep(TestTimeouts::action_timeout_ms()));
+  int exit_code = 0;
+  ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(
+                  TestTimeouts::action_max_timeout_ms(), &exit_code));
+  EXPECT_EQ(-1, exit_code);  // Expect unclean shutdown.
 
   EXPECT_EQ(0, unlink(lock_path_.value().c_str()));
   EXPECT_EQ(0, symlink("FAKEFOOHOST-1234", lock_path_.value().c_str()));
@@ -247,7 +253,10 @@
   // Kill the browser process, so that it does not respond on the socket.
   kill(pid, SIGKILL);
   // Wait for a while to make sure the browser process is actually killed.
-  EXPECT_FALSE(CrashAwareSleep(TestTimeouts::action_timeout_ms()));
+  int exit_code = 0;
+  ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(
+                  TestTimeouts::action_max_timeout_ms(), &exit_code));
+  EXPECT_EQ(-1, exit_code);  // Expect unclean shutdown.
 
   EXPECT_EQ(0, unlink(lock_path_.value().c_str()));
   EXPECT_EQ(0, symlink("FAKEFOOHOST-1234", lock_path_.value().c_str()));