projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
media
/
filters
/
ffmpeg_demuxer_unittest.cc
diff --git
a/src/media/filters/ffmpeg_demuxer_unittest.cc
b/src/media/filters/ffmpeg_demuxer_unittest.cc
index
36e4824
..
da35121
100644
(file)
--- a/
src/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/
src/media/filters/ffmpeg_demuxer_unittest.cc
@@
-358,7
+358,7
@@
TEST_F(FFmpegDemuxerTest, Initialize_MultitrackText) {
}
TEST_F(FFmpegDemuxerTest, Initialize_Encrypted) {
- EXPECT_CALL(*this, NeedKeyCBMock(kWebM
Encrypt
InitDataType, NotNull(),
+ EXPECT_CALL(*this, NeedKeyCBMock(kWebMInitDataType, NotNull(),
DecryptConfig::kDecryptionKeySize))
.Times(Exactly(2));