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

chrome/browser/process_singleton_linux_uitest.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 "chrome/browser/process_singleton.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
 #include <unistd.h>
@@ skipping 153 matching lines @@
 
   // Wait to make sure the browser process is actually stopped.
   // It's necessary when running with valgrind.
   EXPECT_GE(HANDLE_EINTR(waitpid(pid, 0, WUNTRACED)), 0);
 
   std::string url("about:blank");
   EXPECT_EQ(ProcessSingleton::PROCESS_NONE,
             NotifyOtherProcess(url, TestTimeouts::action_timeout_ms()));
 
   // Wait for a while to make sure the browser process is actually killed.
-  int exit_code = 0;
-  ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(
-                  TestTimeouts::action_max_timeout_ms(), &exit_code));
-  EXPECT_EQ(-1, exit_code);  // Expect unclean shutdown.
+  EXPECT_FALSE(CrashAwareSleep(TestTimeouts::action_timeout_ms()));
 }
 
 // Test that we don't kill ourselves by accident if a lockfile with the same pid
 // happens to exist.
 // TODO(mattm): This doesn't really need to be a uitest.  (We don't use the
 // uitest created browser process, but we do use some uitest provided stuff like
 // the user_data_dir and the NotifyOtherProcess function in this file, which
 // would have to be duplicated or shared if this test was moved into a
 // unittest.)
 TEST_F(ProcessSingletonLinuxTest, NotifyOtherProcessNoSuicide) {
@@ skipping 33 matching lines @@
 // Test that we fail when lock says process is on another host and we can't
 // notify it over the socket.
 TEST_F(ProcessSingletonLinuxTest, NotifyOtherProcessDifferingHost) {
   base::ProcessId pid = browser_process_id();
 
   ASSERT_GE(pid, 1);
 
   // 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.
-  int exit_code = 0;
-  ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(
-                  TestTimeouts::action_max_timeout_ms(), &exit_code));
-  EXPECT_EQ(-1, exit_code);  // Expect unclean shutdown.
+  EXPECT_FALSE(CrashAwareSleep(TestTimeouts::action_timeout_ms()));
 
   EXPECT_EQ(0, unlink(lock_path_.value().c_str()));
   EXPECT_EQ(0, symlink("FAKEFOOHOST-1234", lock_path_.value().c_str()));
 
   std::string url("about:blank");
   EXPECT_EQ(ProcessSingleton::PROFILE_IN_USE,
             NotifyOtherProcess(url, TestTimeouts::action_timeout_ms()));
 
   ASSERT_EQ(0, unlink(lock_path_.value().c_str()));
 }
 
 // Test that we fail when lock says process is on another host and we can't
 // notify it over the socket.
 TEST_F(ProcessSingletonLinuxTest, NotifyOtherProcessOrCreate_DifferingHost) {
   base::ProcessId pid = browser_process_id();
 
   ASSERT_GE(pid, 1);
 
   // 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.
-  int exit_code = 0;
-  ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(
-                  TestTimeouts::action_max_timeout_ms(), &exit_code));
-  EXPECT_EQ(-1, exit_code);  // Expect unclean shutdown.
+  EXPECT_FALSE(CrashAwareSleep(TestTimeouts::action_timeout_ms()));
 
   EXPECT_EQ(0, unlink(lock_path_.value().c_str()));
   EXPECT_EQ(0, symlink("FAKEFOOHOST-1234", lock_path_.value().c_str()));
 
   std::string url("about:blank");
   EXPECT_EQ(ProcessSingleton::PROFILE_IN_USE,
             NotifyOtherProcessOrCreate(url, TestTimeouts::action_timeout_ms()));
 
   ASSERT_EQ(0, unlink(lock_path_.value().c_str()));
 }
@@ skipping 30 matching lines @@
   EXPECT_EQ(0, symlink("INCORRECTCOOKIE", cookie_path_.value().c_str()));
 
   // Also change the hostname, so the remote does not retry.
   EXPECT_EQ(0, unlink(lock_path_.value().c_str()));
   EXPECT_EQ(0, symlink("FAKEFOOHOST-1234", lock_path_.value().c_str()));
 
   std::string url("about:blank");
   EXPECT_EQ(ProcessSingleton::PROFILE_IN_USE,
             NotifyOtherProcessOrCreate(url, TestTimeouts::action_timeout_ms()));
 }