| Index: media/filters/decrypting_video_decoder_unittest.cc
|
| diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc
|
| index 738753b518bfe8654395e3554b90e8e6c32d13f6..073a5273d46a79c697251924afa8f81d7227b602 100644
|
| --- a/media/filters/decrypting_video_decoder_unittest.cc
|
| +++ b/media/filters/decrypting_video_decoder_unittest.cc
|
| @@ -53,6 +53,10 @@ ACTION_P2(ResetAndRunCallback, callback, param) {
|
| base::ResetAndReturn(callback).Run(param);
|
| }
|
|
|
| +MATCHER(IsEndOfStream, "end of stream") {
|
| + return (arg->end_of_stream());
|
| +}
|
| +
|
| } // namespace
|
|
|
| class DecryptingVideoDecoderTest : public testing::Test {
|
| @@ -152,7 +156,9 @@ class DecryptingVideoDecoderTest : public testing::Test {
|
| // of stream state. This function must be called after
|
| // EnterNormalDecodingState() to work.
|
| void EnterEndOfStreamState() {
|
| - // The codec in the |decryptor_| will be flushed.
|
| + // The codec in the |decryptor_| will be flushed. We expect kDecodingDelay
|
| + // frames to be returned followed by a EOS frame.
|
| + EXPECT_CALL(*this, FrameReady(IsEndOfStream()));
|
| EXPECT_CALL(*this, FrameReady(decoded_video_frame_))
|
| .Times(kDecodingDelay);
|
| DecodeAndExpect(DecoderBuffer::CreateEOSBuffer(), VideoDecoder::kOk);
|
|
|