diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-29 14:40:03 +0100 |
| commit | 90dce4d38c5ff5333bea97d859d4e484e27edf0c (patch) | |
| tree | 9c51c7dd97d24b15befa97a3482c51851e5383a1 /media/filters/ffmpeg_demuxer_unittest.cc | |
| parent | 1515035f5917d10d363b0888a3615d581ad8b83f (diff) | |
| download | chromium_org-90dce4d38c5ff5333bea97d859d4e484e27edf0c.tar.gz | |
Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py.
Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
Diffstat (limited to 'media/filters/ffmpeg_demuxer_unittest.cc')
| -rw-r--r-- | media/filters/ffmpeg_demuxer_unittest.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index 9993beec8c..163ad98cf8 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc @@ -7,7 +7,6 @@ #include <string> #include "base/bind.h" -#include "base/file_util.h" #include "base/files/file_path.h" #include "base/path_service.h" #include "base/threading/thread.h" @@ -295,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)); |