Index: content/browser/media_browsertest.cc |
diff --git a/content/browser/media_browsertest.cc b/content/browser/media_browsertest.cc |
index 41f3ac3beec234e4e82b46b22af5c08d1f0a7624..ce46ef28704368ce198c0537eefc1b63b5fa7efb 100644 |
--- a/content/browser/media_browsertest.cc |
+++ b/content/browser/media_browsertest.cc |
@@ -148,16 +148,9 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { |
PlayAudio("bear_pcm.wav", GetParam()); |
} |
-#if defined(OS_MACOSX) |
-// TODO(dalecurtis): Flaky on Mac 10.6. http://crbug.com/142896 |
-IN_PROC_BROWSER_TEST_P(MediaTest, FLAKY_VideoTulipWebm) { |
- PlayVideo("tulip2.webm", GetParam()); |
-} |
-#else |
IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) { |
PlayVideo("tulip2.webm", GetParam()); |
} |
-#endif |
INSTANTIATE_TEST_CASE_P(File, MediaTest, ::testing::Values(false)); |
INSTANTIATE_TEST_CASE_P(Http, MediaTest, ::testing::Values(true)); |