Wait properly for renderer crashes

chrome/common/logging_chrome_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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 66 matching lines @@
 
 // Touch build will start an extra renderer process (the extension process)
 // for the virtual keyboard.
 #if defined(TOUCH_UI)
 #define EXPECTED_ASSERT_ERRORS 2
 #else
 #define EXPECTED_ASSERT_ERRORS 1
 #endif
 
 #if !defined(NDEBUG)  // We don't have assertions in release builds.
-// Tests whether we correctly fail on browser assertions during tests.
+// Tests whether we correctly fail on renderer assertions during tests.
 class AssertionTest : public UITest {
  protected:
-  AssertionTest() : UITest() {
-    // Initial loads will never complete due to assertion.
+  AssertionTest() {
+#if defined(OS_WIN)
+    // TODO(phajdan.jr): Make crash notifications on launch work on Win.
     wait_for_initial_loads_ = false;
-
-    // We're testing the renderer rather than the browser assertion here,
-    // because the browser assertion would flunk the test during SetUp()
-    // (since TAU wouldn't be able to find the browser window).
+#endif
     launch_arguments_.AppendSwitch(switches::kRendererAssertTest);
   }
 };
 
 // Launch the app in assertion test mode, then close the app.
 #if defined(OS_WIN)
 // http://crbug.com/26715
 #define Assertion DISABLED_Assertion
 #elif defined(OS_MACOSX)
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define Assertion DISABLED_Assertion
 #endif
 TEST_F(AssertionTest, Assertion) {
   expected_errors_ = EXPECTED_ASSERT_ERRORS;
   expected_crashes_ = EXPECTED_ASSERT_CRASHES;
 }
 #endif  // !defined(NDEBUG)
 
 #if !defined(OFFICIAL_BUILD)
 // Only works on Linux in Release mode with CHROME_HEADLESS=1
 class CheckFalseTest : public UITest {
  protected:
-  CheckFalseTest() : UITest() {
-    // Initial loads will never complete due to assertion.
+  CheckFalseTest() {
+#if defined(OS_WIN)
+    // TODO(phajdan.jr): Make crash notifications on launch work on Win.
     wait_for_initial_loads_ = false;
-
-    // We're testing the renderer rather than the browser assertion here,
-    // because the browser assertion would flunk the test during SetUp()
-    // (since TAU wouldn't be able to find the browser window).
+#endif
     launch_arguments_.AppendSwitch(switches::kRendererCheckFalseTest);
   }
 };
 
 #if defined(OS_WIN)
 // http://crbug.com/38497
 #define CheckFails FLAKY_CheckFails
 #elif defined(OS_MACOSX)
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define CheckFails DISABLED_CheckFails
 #endif
 // Launch the app in assertion test mode, then close the app.
 TEST_F(CheckFalseTest, CheckFails) {
   expected_errors_ = EXPECTED_ASSERT_ERRORS;
   expected_crashes_ = EXPECTED_ASSERT_CRASHES;
 }
 #endif  // !defined(OFFICIAL_BUILD)
 
 // Tests whether we correctly fail on browser crashes during UI Tests.
 class RendererCrashTest : public UITest {
  protected:
-  RendererCrashTest() : UITest() {
-    // Initial loads will never complete due to crash.
+  RendererCrashTest() {
+#if defined(OS_WIN)
+    // TODO(phajdan.jr): Make crash notifications on launch work on Win.
     wait_for_initial_loads_ = false;
-
+#endif
     launch_arguments_.AppendSwitch(switches::kRendererCrashTest);
   }
 };
 
 #if defined(OS_LINUX) && !defined(USE_LINUX_BREAKPAD)
 // On Linux, do not expect a crash dump if Breakpad is disabled.
 #define EXPECTED_CRASH_CRASHES 0
 #else
 #define EXPECTED_CRASH_CRASHES 1
 #endif
 
 #if defined(OS_MACOSX)
 // Crash service doesn't exist for the Mac yet: http://crbug.com/45243
 #define Crash DISABLED_Crash
 #endif
 // Launch the app in renderer crash test mode, then close the app.
 TEST_F(RendererCrashTest, Crash) {
   scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser.get());
   ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
   expected_crashes_ = EXPECTED_CRASH_CRASHES;
 }