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

Unified Diff: content/browser/media/media_browsertest.cc

Issue 2080383004: Disable crashing media tests on Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months 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 | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
}
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698