summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/filters/ffmpeg_demuxer_unittest.cc4
-rw-r--r--media/filters/pipeline_integration_test.cc4
2 files changed, 2 insertions, 6 deletions
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index 62ffffd..163ad98 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -294,9 +294,7 @@ TEST_F(FFmpegDemuxerTest, Initialize_Multitrack) {
EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::UNKNOWN));
}
-// TODO(fgalligan): Enable test when code to parse encrypted WebM files lands
-// in Chromium's FFmpeg. crbug.com/189221
-TEST_F(FFmpegDemuxerTest, DISABLED_Initialize_Encrypted) {
+TEST_F(FFmpegDemuxerTest, Initialize_Encrypted) {
EXPECT_CALL(*this, NeedKeyCBMock(kWebMEncryptInitDataType, NotNull(),
DecryptConfig::kDecryptionKeySize))
.Times(Exactly(2));
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 3b456a1..63a6892 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -431,9 +431,7 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
EXPECT_EQ("-3.59,-2.06,-0.43,2.15,0.77,-0.95,", GetAudioHash());
}
-// TODO(fgalligan): Enable test when code to parse encrypted WebM files lands
-// in Chromium's FFmpeg. crbug.com/189221
-TEST_F(PipelineIntegrationTest, DISABLED_BasicPlaybackEncrypted) {
+TEST_F(PipelineIntegrationTest, BasicPlaybackEncrypted) {
FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
set_need_key_cb(base::Bind(&FakeEncryptedMedia::NeedKey,
base::Unretained(&encrypted_media)));