summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/media_uitest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
index a07bd63..e344d0b 100644
--- a/chrome/browser/media_uitest.cc
+++ b/chrome/browser/media_uitest.cc
@@ -107,7 +107,14 @@ TEST_F(MediaTest, MAYBE_VideoBearWav) {
PlayVideo("bear.wav");
}
-TEST_F(UILayoutTest, MediaUILayoutTest) {
+#if defined(OS_MACOSX)
+// http://crbug.com/84463 - MediaUILayoutTest is flaky on Mac.
+#define MAYBE_MediaUILayoutTest FLAKY_MediaUILayoutTest
+#else
+#define MAYBE_MediaUILayoutTest MediaUILayoutTest
+#endif
+
+TEST_F(UILayoutTest, MAYBE_MediaUILayoutTest) {
static const char* kResources[] = {
"content",
"media-file.js",