| Index: content/browser/media/media_browsertest.cc
|
| diff --git a/content/browser/media/media_browsertest.cc b/content/browser/media/media_browsertest.cc
|
| index 4f6779926ced6182fd0d676711f618f96f4424fe..2f52ad5a9d7376edda92c196e7dc02992e86bb37 100644
|
| --- a/content/browser/media/media_browsertest.cc
|
| +++ b/content/browser/media/media_browsertest.cc
|
| @@ -127,7 +127,13 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentWebm) {
|
| }
|
|
|
| #if defined(USE_PROPRIETARY_CODECS)
|
| -IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearMp4) {
|
| +// Crashes on Mac only. http://crbug.com/621857
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_VideoBearMp4 DISABLED_VideoBearMp4
|
| +#else
|
| +#define MAYBE_VideoBearMp4 VideoBearMp4
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoBearMp4) {
|
| PlayVideo("bear.mp4", GetParam());
|
| }
|
|
|
| @@ -135,7 +141,13 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearHighBitDepthMp4) {
|
| PlayVideo("bear-320x180-hi10p.mp4", GetParam());
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearSilentMp4) {
|
| +// Crashes on Mac only. http://crbug.com/621857
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_VideoBearSilentMp4 DISABLED_VideoBearSilentMp4
|
| +#else
|
| +#define MAYBE_VideoBearSilentMp4 VideoBearSilentMp4
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_P(MediaTest, MAYBE_VideoBearSilentMp4) {
|
| PlayVideo("bear_silent.mp4", GetParam());
|
| }
|
|
|
|
|