Chromium Code Reviews| Index: media/filters/decrypting_audio_decoder_unittest.cc |
| diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc |
| index 1ca19b88c9014b84a4386b09ab7cd3af866c10b9..757d2be7ba938b072259c247e3790aaf01bf516a 100644 |
| --- a/media/filters/decrypting_audio_decoder_unittest.cc |
| +++ b/media/filters/decrypting_audio_decoder_unittest.cc |
| @@ -62,8 +62,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") { |
|
scherkus (not reviewing)
2013/06/20 21:29:13
revert this -- matchers aren't setters/getters and
|
| + return (arg->is_end_of_stream()); |
| } |
| } // namespace |
| @@ -80,10 +80,10 @@ class DecryptingAudioDecoderTest : public testing::Test { |
| demuxer_(new StrictMock<MockDemuxerStream>(DemuxerStream::AUDIO)), |
| encrypted_buffer_(CreateFakeEncryptedBuffer()), |
| decoded_frame_(NULL), |
| - end_of_stream_frame_(DataBuffer::CreateEOSBuffer()), |
| + end_of_stream_frame_(DataBuffer::create_eos_buffer()), |
| decoded_frame_list_() { |
| scoped_refptr<DataBuffer> data_buffer = new DataBuffer(kFakeAudioFrameSize); |
| - data_buffer->SetDataSize(kFakeAudioFrameSize); |
| + data_buffer->set_data_size(kFakeAudioFrameSize); |
| // |decoded_frame_| contains random data. |
| decoded_frame_ = data_buffer; |
| decoded_frame_list_.push_back(decoded_frame_); |
| @@ -122,8 +122,8 @@ class DecryptingAudioDecoderTest : public testing::Test { |
| const scoped_refptr<DataBuffer>& audio_frame) { |
| if (status != AudioDecoder::kOk) |
| EXPECT_CALL(*this, FrameReady(status, IsNull())); |
| - else if (audio_frame->IsEndOfStream()) |
| - EXPECT_CALL(*this, FrameReady(status, IsEndOfStream())); |
| + else if (audio_frame->is_end_of_stream()) |
| + EXPECT_CALL(*this, FrameReady(status, is_end_of_stream())); |
| else |
| EXPECT_CALL(*this, FrameReady(status, audio_frame)); |
| @@ -322,9 +322,9 @@ TEST_F(DecryptingAudioDecoderTest, DecryptAndDecode_MultipleFrames) { |
| Initialize(); |
| scoped_refptr<DataBuffer> frame_a = new DataBuffer(kFakeAudioFrameSize); |
| - frame_a->SetDataSize(kFakeAudioFrameSize); |
| + frame_a->set_data_size(kFakeAudioFrameSize); |
| scoped_refptr<DataBuffer> frame_b = new DataBuffer(kFakeAudioFrameSize); |
| - frame_b->SetDataSize(kFakeAudioFrameSize); |
| + frame_b->set_data_size(kFakeAudioFrameSize); |
| decoded_frame_list_.push_back(frame_a); |
| decoded_frame_list_.push_back(frame_b); |