MediaTest.VideoBearTheora and MediaTest.VideoBearWav are flaky on Mac

Failure output: 
http://build.chromium.org/p/chromium/builders/Mac10.6%20Tests%20%283%29/builds/2338/steps/ui_tests/logs/VideoBearTheora 

[ RUN ] MediaTest.VideoBearTheora 
pure virtual method called 
terminate called without an active exception 
/b/build/slave/cr-mac-rel/build/src/chrome/test/automation/proxy_launcher.cc:270: Failure 
Value of: exit_code 
Actual: -1 
Expected: 0

BUG=88834
TEST=None
TBR=imcheng, annacc
Review URL: http://codereview.chromium.org/7329038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91969 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 3 deletions

diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
index 89ac5290..34dbcff 100644
--- a/chrome/browser/media_uitest.cc
+++ b/chrome/browser/media_uitest.cc
@@ -65,7 +65,19 @@ class MediaTest : public UITest {
   }
 };
 
-TEST_F(MediaTest, VideoBearTheora) {
+#if defined(OS_MACOSX)
+// http://crbug.com/88834 - VideoBearTheora, VideoBearWav and VideoBearWebm
+// are flaky on Mac.
+#define MAYBE_VideoBearTheora FLAKY_VideoBearTheora
+#define MAYBE_VideoBearWav FLAKY_VideoBearWav
+#define MAYBE_VideoBearWebm FLAKY_VideoBearWebm
+#else
+#define MAYBE_VideoBearTheora VideoBearTheora
+#define MAYBE_VideoBearWav  VideoBearWav
+#define MAYBE_VideoBearWebm VideoBearWebm
+#endif
+
+TEST_F(MediaTest, MAYBE_VideoBearTheora) {
   PlayVideo("bear.ogv");
 }
 
@@ -73,7 +85,7 @@ TEST_F(MediaTest, VideoBearSilentTheora) {
   PlayVideo("bear_silent.ogv");
 }
 
-TEST_F(MediaTest, VideoBearWebm) {
+TEST_F(MediaTest, MAYBE_VideoBearWebm) {
   PlayVideo("bear.webm");
 }
 
@@ -91,7 +103,7 @@ TEST_F(MediaTest, VideoBearSilentMp4) {
 }
 #endif
 
-TEST_F(MediaTest, VideoBearWav) {
+TEST_F(MediaTest, MAYBE_VideoBearWav) {
   PlayVideo("bear.wav");
 }