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

Unified Diff: content/browser/media_browsertest.cc

Issue 11364104: Tentatively reenable MediaTest.VideoTulipWebm on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 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));
« 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