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

chrome/browser/unload_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 "base/file_util.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/net/url_request_mock_http_job.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
@@ skipping 85 matching lines @@
     const testing::TestInfo* const test_info =
         testing::UnitTest::GetInstance()->current_test_info();
     if (strcmp(test_info->name(),
         "BrowserCloseTabWhenOtherTabHasListener") == 0) {
       launch_arguments_.AppendSwitch(switches::kDisablePopupBlocking);
     }
 
     UITest::SetUp();
   }
 
+  void WaitForBrowserClosed() {
+    const int kCheckDelayMs = 100;
+    for (int max_wait_time = TestTimeouts::action_max_timeout_ms();
+         max_wait_time > 0; max_wait_time -= kCheckDelayMs) {
+      CrashAwareSleep(kCheckDelayMs);
+      if (!IsBrowserRunning())
+        break;
+    }
+
+    EXPECT_FALSE(IsBrowserRunning());
+  }
+
   void CheckTitle(const std::wstring& expected_title) {
     const int kCheckDelayMs = 100;
     for (int max_wait_time = TestTimeouts::action_max_timeout_ms();
          max_wait_time > 0; max_wait_time -= kCheckDelayMs) {
+      CrashAwareSleep(kCheckDelayMs);
       if (expected_title == GetActiveTabTitle())
         break;
-      base::PlatformThread::Sleep(kCheckDelayMs);
     }
 
     EXPECT_EQ(expected_title, GetActiveTabTitle());
   }
 
   void NavigateToDataURL(const std::string& html_content,
                          const std::wstring& expected_title) {
     NavigateToURL(GURL("data:text/html," + html_content));
     CheckTitle(expected_title);
   }
@@ skipping 159 matching lines @@
 
 // Tests closing the browser with a beforeunload handler and clicking
 // OK in the beforeunload confirm dialog.
 TEST_F(UnloadTest, BrowserCloseBeforeUnloadOK) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
 
   CloseBrowserAsync(browser.get());
   ClickModalDialogButton(ui::MessageBoxFlags::DIALOGBUTTON_OK);
-
-  int exit_code = -1;
-  ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(
-                  TestTimeouts::action_max_timeout_ms(), &exit_code));
-  EXPECT_EQ(0, exit_code);  // Expect a clean shutown.
+  WaitForBrowserClosed();
 }
 
 // Tests closing the browser with a beforeunload handler and clicking
 // CANCEL in the beforeunload confirm dialog.
 TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   NavigateToDataURL(BEFORE_UNLOAD_HTML, L"beforeunload");
 
   CloseBrowserAsync(browser.get());
   ClickModalDialogButton(ui::MessageBoxFlags::DIALOGBUTTON_CANCEL);
-
   // There's no real graceful way to wait for something _not_ to happen, so
   // we just wait a short period.
-  base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
+  CrashAwareSleep(500);
   ASSERT_TRUE(IsBrowserRunning());
 
   CloseBrowserAsync(browser.get());
   ClickModalDialogButton(ui::MessageBoxFlags::DIALOGBUTTON_OK);
-
-  int exit_code = -1;
-  ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(
-                  TestTimeouts::action_max_timeout_ms(), &exit_code));
-  EXPECT_EQ(0, exit_code);  // Expect a clean shutdown.
+  WaitForBrowserClosed();
 }
 
 #if defined(OS_LINUX)
 // Fails sometimes on Linux valgrind. http://crbug.com/45675
 #define MAYBE_BrowserCloseWithInnerFocusedFrame \
     FLAKY_BrowserCloseWithInnerFocusedFrame
 #else
 #define MAYBE_BrowserCloseWithInnerFocusedFrame \
     BrowserCloseWithInnerFocusedFrame
 #endif
 
 // Tests closing the browser and clicking OK in the beforeunload confirm dialog
 // if an inner frame has the focus.  See crbug.com/32615.
 TEST_F(UnloadTest, MAYBE_BrowserCloseWithInnerFocusedFrame) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
 
   NavigateToDataURL(INNER_FRAME_WITH_FOCUS_HTML, L"innerframewithfocus");
 
   CloseBrowserAsync(browser.get());
   ClickModalDialogButton(ui::MessageBoxFlags::DIALOGBUTTON_OK);
-
-  int exit_code = -1;
-  ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(
-                  TestTimeouts::action_max_timeout_ms(), &exit_code));
-  EXPECT_EQ(0, exit_code);  // Expect a clean shutdown.
+  WaitForBrowserClosed();
 }
 
 // Tests closing the browser with a beforeunload handler that takes
 // two seconds to run.
 TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnload) {
   LoadUrlAndQuitBrowser(TWO_SECOND_BEFORE_UNLOAD_HTML,
                         L"twosecondbeforeunload");
 }
 
 // Tests closing the browser on a page with an unload listener registered where
@@ skipping 90 matching lines @@
   ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
   scoped_refptr<TabProxy> main_tab(browser->GetActiveTab());
   ASSERT_TRUE(main_tab.get());
   std::wstring main_title;
   EXPECT_TRUE(main_tab->GetTabTitle(&main_title));
   EXPECT_EQ(std::wstring(L"only_one_unload"), main_title);
 }
 
 // TODO(ojan): Add tests for unload/beforeunload that have multiple tabs
 // and multiple windows.