summaryrefslogtreecommitdiffstats
path: root/chrome/worker/worker_uitest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/worker/worker_uitest.cc')
-rw-r--r--chrome/worker/worker_uitest.cc15
1 files changed, 11 insertions, 4 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 47054f3..7f7756f 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -216,20 +216,27 @@ TEST_F(WorkerTest, SharedWorkerHttpAuth) {
// dialogs displayed by non-navigating tabs.
}
-// Crashy, see http://crbug.com/22898, http://crbug.com/35023.
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests0) {
+// Crashy on Linux and Mac, see http://crbug.com/28445, http://crbug.com/22898,
+// http://crbug.com/35023.
+#if defined(OS_LINUX) || defined(OS_MACOSX)
+#define WorkerFastLayoutTests0 DISABLED_WorkerFastLayoutTests0
+#define WorkerFastLayoutTests1 DISABLED_WorkerFastLayoutTests1
+#define WorkerFastLayoutTests2 DISABLED_WorkerFastLayoutTests2
+#endif
+
+TEST_F(WorkerTest, WorkerFastLayoutTests0) {
SCOPED_TRACE("");
RunWorkerFastLayoutTests(0);
}
// Crashy, see http://crbug.com/22898, http://crbug.com/35023.
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests1) {
+TEST_F(WorkerTest, WorkerFastLayoutTests1) {
SCOPED_TRACE("");
RunWorkerFastLayoutTests(1);
}
// Crashy, see http://crbug.com/22898, http://crbug.com/35023.
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests2) {
+TEST_F(WorkerTest, WorkerFastLayoutTests2) {
SCOPED_TRACE("");
RunWorkerFastLayoutTests(2);
}