| Index: media/filters/decrypting_demuxer_stream_unittest.cc
|
| diff --git a/media/filters/decrypting_demuxer_stream_unittest.cc b/media/filters/decrypting_demuxer_stream_unittest.cc
|
| index e5a32c85a94cf01d0c781f682273d994ed46e1c0..ca769341ac0c56e82e608d11740ec3b9916fcdde 100644
|
| --- a/media/filters/decrypting_demuxer_stream_unittest.cc
|
| +++ b/media/filters/decrypting_demuxer_stream_unittest.cc
|
| @@ -57,8 +57,8 @@ ACTION_P2(ResetAndRunCallback, callback, param) {
|
| base::ResetAndReturn(callback).Run(param);
|
| }
|
|
|
| -MATCHER(IsEndOfStream, "end of stream") {
|
| - return (arg->IsEndOfStream());
|
| +MATCHER(is_end_of_stream, "end of stream") {
|
| + return (arg->is_end_of_stream());
|
| }
|
|
|
| } // namespace
|
| @@ -129,8 +129,8 @@ class DecryptingDemuxerStreamTest : public testing::Test {
|
| const scoped_refptr<DecoderBuffer>& decrypted_buffer) {
|
| if (status != DemuxerStream::kOk)
|
| EXPECT_CALL(*this, BufferReady(status, IsNull()));
|
| - else if (decrypted_buffer->IsEndOfStream())
|
| - EXPECT_CALL(*this, BufferReady(status, IsEndOfStream()));
|
| + else if (decrypted_buffer->is_end_of_stream())
|
| + EXPECT_CALL(*this, BufferReady(status, is_end_of_stream()));
|
| else
|
| EXPECT_CALL(*this, BufferReady(status, decrypted_buffer));
|
|
|
| @@ -292,10 +292,10 @@ TEST_F(DecryptingDemuxerStreamTest, Read_EndOfStream) {
|
|
|
| // No Decryptor::Decrypt() call is expected for EOS buffer.
|
| EXPECT_CALL(*input_audio_stream_, Read(_))
|
| - .WillOnce(ReturnBuffer(DecoderBuffer::CreateEOSBuffer()));
|
| + .WillOnce(ReturnBuffer(DecoderBuffer::create_eos_buffer()));
|
|
|
| ReadAndExpectBufferReadyWith(DemuxerStream::kOk,
|
| - DecoderBuffer::CreateEOSBuffer());
|
| + DecoderBuffer::create_eos_buffer());
|
| }
|
|
|
| // Test the case where the a key is added when the decryptor is in
|
|
|