Commit 77195a8a authored by Avi Drissman's avatar Avi Drissman

Re-enable failing EncryptedMediaTests.

BUG=444827, 440675

Review URL: https://codereview.chromium.org/826583002

Cr-Commit-Position: refs/heads/master@{#309584}
parent 85748694
......@@ -551,23 +551,11 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) {
TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo);
}
// Fails on linux debug: http://crbug.com/444827.
#if defined(OS_LINUX)
#define MAYBE_Playback_VP9Video_WebM DISABLED_Playback_VP9Video_WebM
#else
#define MAYBE_Playback_VP9Video_WebM Playback_VP9Video_WebM
#endif
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_Playback_VP9Video_WebM) {
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) {
TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly);
}
// Fails on linux debug: http://crbug.com/444827.
#if defined(OS_LINUX)
#define MAYBE_Playback_AudioOnly_WebM_Opus DISABLED_Playback_AudioOnly_WebM_Opus
#else
#define MAYBE_Playback_AudioOnly_WebM_Opus Playback_AudioOnly_WebM_Opus
#endif
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_Playback_AudioOnly_WebM_Opus) {
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) {
TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly);
}
......@@ -595,13 +583,7 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
TestConfigChange();
}
// Fails on linux debug: http://crbug.com/444827.
#if defined(OS_LINUX)
#define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo
#else
#define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo
#endif
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) {
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
// Times out on Windows XP. http://crbug.com/171937
#if defined(OS_WIN)
if (base::win::GetVersion() < base::win::VERSION_VISTA)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment