diff options
| -rw-r--r-- | chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc | 4 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc index f3b5a07..ea12275 100644 --- a/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc +++ b/chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc @@ -193,7 +193,7 @@ TEST_F(ResourceDispatcherTest, CrossSiteOnunloadCookie) { ASSERT_STREQ("foo", value_result.c_str()); } -#if !defined(OS_MACOSX) +#if defined(OS_WIN) // Tests that the onbeforeunload and onunload logic is shortcutted if the old // renderer is gone. In that case, we don't want to wait for the old renderer // to run the handlers. @@ -202,6 +202,8 @@ TEST_F(ResourceDispatcherTest, CrossSiteOnunloadCookie) { // Unfortunately, if the app isn't stripped of debug symbols, this takes about // five minutes to complete and isn't conducive to quick turnarounds. As we // don't currently strip the app on the build bots, this is bad times. +// TODO(albertb): We need to disable this on Linux as well since +// crash_service.exe hasn't been ported yet. TEST_F(ResourceDispatcherTest, CrossSiteAfterCrash) { // This test only works in multi-process mode if (in_process_renderer()) diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 386f5f2..62ba163 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -156,7 +156,6 @@ void UITest::TearDown() { } EXPECT_EQ(expected_errors_, assertions.size()) << failures; -#if defined(OS_WIN) // Check for crashes during the test FilePath crash_dump_path; PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_path); @@ -170,11 +169,6 @@ void UITest::TearDown() { error_msg += kFailedNoCrashService; } EXPECT_EQ(expected_crashes_, actual_crashes) << error_msg; -#else - // TODO(port): we don't catch crashes, nor have CountFilesCreatedAfter. - // http://code.google.com/p/chromium/issues/detail?id=9833 - NOTIMPLEMENTED() << " bug 9833 and crash catching."; -#endif } // Pick up the various test time out values from the command line. |