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

Unified Diff: chrome/browser/media_uitest.cc

Issue 8536024: Correct MediaUILayoutTest expectations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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: chrome/browser/media_uitest.cc
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
index 4e40a61a3ac3e2e4a150e5e38ba34c62869777d2..a6f49a5e5849b65326637d98ad3294a01e1b9594 100644
--- a/chrome/browser/media_uitest.cc
+++ b/chrome/browser/media_uitest.cc
@@ -132,11 +132,11 @@ TEST_F(MediaTest, MAYBE_VideoBearWavPcm) {
PlayVideo("bear_pcm.wav");
}
-#if defined(OS_MACOSX) || defined(OS_LINUX)
-// http://crbug.com/95274 - MediaUILayoutTest is flaky on Mac.
-// http://crbug.com/103832 - MediaUILayoutTest is flaky on Linux.
+#if defined(OS_MACOSX)
+// http://crbug.com/95274
#define MAYBE_MediaUILayoutTest FLAKY_MediaUILayoutTest
-#elif defined(OS_POSIX) && defined(TOOLKIT_VIEWS)
+#elif defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
+// http://crbug.com/103832
#define MAYBE_MediaUILayoutTest FAILS_MediaUILayoutTest
#else
#define MAYBE_MediaUILayoutTest MediaUILayoutTest
« 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