Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1170)

Unified Diff: content/browser/media_browsertest.cc

Issue 10828346: Marking 'MediaTest.VideoTulipWebm' as flaky on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bah. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/media_browsertest.cc
diff --git a/content/browser/media_browsertest.cc b/content/browser/media_browsertest.cc
index aa0b41d7a2f1cb966cc8ae3d02f5c0bc49420bff..db6d67b9ef865af43fc08e294a3c3b52ccb65c1a 100644
--- a/content/browser/media_browsertest.cc
+++ b/content/browser/media_browsertest.cc
@@ -148,7 +148,13 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) {
PlayAudio("bear_pcm.wav", GetParam());
}
-IN_PROC_BROWSER_TEST_P(MediaTest, VideoTulipWebm) {
+#if defined(OS_MACOSX)
+// Flaking on Mac 10.6. http://crbug.com/143151
+#define MAYBE_VideoTulipWebm FLAKY_VideoTulipWebm
+#else
+#define MAYBE_VideoTulipWebm VideoTulipWebm
+#endif
+IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoTulipWebm) {
PlayVideo("tulip2.webm", GetParam());
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698