Mark more WorkerTest flakiness.

TBR=finnur@chromium.org
BUG=101996

Review URL: http://codereview.chromium.org/8505010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109223 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 32 insertions, 4 deletions

diff --git a/content/worker/test/worker_uitest.cc b/content/worker/test/worker_uitest.cc
index ced13a3..d10625b 100644
--- a/content/worker/test/worker_uitest.cc
+++ b/content/worker/test/worker_uitest.cc
@@ -255,7 +255,14 @@ TEST_F(WorkerTest, SharedWorkerHttpAuth) {
   // dialogs displayed by non-navigating tabs.
 }
 
-TEST_F(WorkerTest, StressJSExecution) {
+#if defined(OS_WIN)
+// http://crbug.com/101996
+#define MAYBE_StressJSExecution) FLAKY_StressJSExecution
+#else
+#define MAYBE_StressJSExecution StressJSExecution
+#endif
+
+TEST_F(WorkerTest, MAYBE_StressJSExecution) {
   RunWorkerFastLayoutTest("stress-js-execution.html");
 }
 
@@ -270,7 +277,14 @@ TEST_F(WorkerTest, MAYBE_UseMachineStack) {
   RunWorkerFastLayoutTest("use-machine-stack.html");
 }
 
-TEST_F(WorkerTest, WorkerCall) {
+#if defined(OS_WIN)
+// http://crbug.com/101996
+#define MAYBE_WorkerCall FLAKY_WorkerCall
+#else
+#define MAYBE_WorkerCall WorkerCall
+#endif
+
+TEST_F(WorkerTest, MAYBE_WorkerCall) {
   RunWorkerFastLayoutTest("worker-call.html");
 }
 
@@ -280,7 +294,7 @@ TEST_F(WorkerTest, DISABLED_WorkerClonePort) {
   RunWorkerFastLayoutTest("worker-cloneport.html");
 }
 
-#if defined(OS_WIN)
+#if defined(OS_MACOSX) || defined(OS_WIN)
 // http://crbug.com/101996
 #define MAYBE_WorkerCloseFast FLAKY_WorkerCloseFast
 #else
@@ -350,7 +364,14 @@ TEST_F(WorkerTest, DISABLED_WorkerLifecycle) {
   RunWorkerFastLayoutTest("worker-lifecycle.html");
 }
 
-TEST_F(WorkerTest, WorkerLocation) {
+#if defined(OS_WIN)
+// http://crbug.com/101996
+#define MAYBE_WorkerLocation FLAKY_WorkerLocation
+#else
+#define MAYBE_WorkerLocation WorkerLocation
+#endif
+
+TEST_F(WorkerTest, MAYBE_WorkerLocation) {
   RunWorkerFastLayoutTest("worker-location.html");
 }
 
@@ -868,6 +889,13 @@ class WorkerFileSystemTest : public WorkerTest {
 #define MAYBE_AsyncOperations FLAKY_AsyncOperations
 #define MAYBE_SyncOperations FLAKY_SyncOperations
 #define MAYBE_FileEntryToURISync FLAKY_FileEntryToURISync
+#elif defined(OS_MACOSX)
+#define MAYBE_Temporary Temporary
+#define MAYBE_Persistent Persistent
+#define MAYBE_SyncTemporary SyncTemporary
+#define MAYBE_AsyncOperations AsyncOperations
+#define MAYBE_SyncOperations FLAKY_SyncOperations
+#define MAYBE_FileEntryToURISync FileEntryToURISync
 #else
 #define MAYBE_Temporary Temporary
 #define MAYBE_Persistent Persistent