Chromium Code Reviews| Index: chrome/common/logging_chrome_uitest.cc |
| diff --git a/chrome/common/logging_chrome_uitest.cc b/chrome/common/logging_chrome_uitest.cc |
| index b72661a9d003d7dd16e2effd022a4c858c2bae86..d4bbfa1ba92122ed32eb3e94ace740eed6fa2ced 100644 |
| --- a/chrome/common/logging_chrome_uitest.cc |
| +++ b/chrome/common/logging_chrome_uitest.cc |
| @@ -84,16 +84,14 @@ TEST_F(ChromeLoggingTest, EnvironmentLogFileName) { |
| #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). |
|
darin (slow to review)
2011/09/15 05:43:37
lol... TAU! TAU was the very first automation sys
|
| +#endif |
| launch_arguments_.AppendSwitch(switches::kRendererAssertTest); |
| } |
| }; |
| @@ -116,13 +114,11 @@ TEST_F(AssertionTest, Assertion) { |
| // 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); |
| } |
| }; |
| @@ -144,10 +140,11 @@ TEST_F(CheckFalseTest, CheckFails) { |
| // 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); |
| } |
| }; |