| Index: media/filters/ffmpeg_demuxer_unittest.cc
|
| diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
|
| index 62ffffd920465a96a7590e3648c9e4d89f327588..163ad98cf88242b4900c1ed1eb04dda71add4c8b 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));
|
|
|