Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(349)

Unified Diff: media/filters/decrypting_video_decoder_unittest.cc

Issue 17408005: Refactored DecoderBuffer to use unix_hacker_style naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@localrefactor
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 27d4e5383ecb5823e8fb21460ad55cba704b626b..d7c5f814f804bb5b0afc309d48310ad4d96a9a48 100644
--- a/media/filters/decrypting_video_decoder_unittest.cc
+++ b/media/filters/decrypting_video_decoder_unittest.cc
@@ -59,7 +59,7 @@ ACTION_P2(ResetAndRunCallback, callback, param) {
base::ResetAndReturn(callback).Run(param);
}
-MATCHER(IsEndOfStream, "end of stream") {
+MATCHER(is_end_of_stream, "end of stream") {
return (arg->IsEndOfStream());
}
@@ -117,7 +117,7 @@ class DecryptingVideoDecoderTest : public testing::Test {
if (status != VideoDecoder::kOk)
EXPECT_CALL(*this, FrameReady(status, IsNull()));
else if (video_frame.get() && video_frame->IsEndOfStream())
- EXPECT_CALL(*this, FrameReady(status, IsEndOfStream()));
+ EXPECT_CALL(*this, FrameReady(status, is_end_of_stream()));
else
EXPECT_CALL(*this, FrameReady(status, video_frame));
@@ -131,7 +131,7 @@ class DecryptingVideoDecoderTest : public testing::Test {
void EnterNormalDecodingState() {
EXPECT_CALL(*demuxer_, Read(_))
.WillOnce(ReturnBuffer(encrypted_buffer_))
- .WillRepeatedly(ReturnBuffer(DecoderBuffer::CreateEOSBuffer()));
+ .WillRepeatedly(ReturnBuffer(DecoderBuffer::create_eos_buffer()));
EXPECT_CALL(*decryptor_, DecryptAndDecodeVideo(_, _))
.WillOnce(RunCallback<1>(Decryptor::kSuccess, decoded_video_frame_))
.WillRepeatedly(RunCallback<1>(Decryptor::kNeedMoreData,

Powered by Google App Engine
This is Rietveld 408576698