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

Unified Diff: media/filters/decrypting_demuxer_stream_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, 5 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
« no previous file with comments | « media/filters/decrypting_demuxer_stream.cc ('k') | media/filters/decrypting_video_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..8916a7274fb40e9cd8d34979314a1842460f9f97 100644
--- a/media/filters/decrypting_demuxer_stream_unittest.cc
+++ b/media/filters/decrypting_demuxer_stream_unittest.cc
@@ -31,7 +31,7 @@ static const uint8 kFakeIv[DecryptConfig::kDecryptionKeySize] = { 0 };
// Create a fake non-empty encrypted buffer.
static scoped_refptr<DecoderBuffer> CreateFakeEncryptedBuffer() {
scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(kFakeBufferSize));
- buffer->SetDecryptConfig(scoped_ptr<DecryptConfig>(new DecryptConfig(
+ buffer->set_decrypt_config(scoped_ptr<DecryptConfig>(new DecryptConfig(
std::string(reinterpret_cast<const char*>(kFakeKeyId),
arraysize(kFakeKeyId)),
std::string(reinterpret_cast<const char*>(kFakeIv), arraysize(kFakeIv)),
@@ -58,7 +58,7 @@ ACTION_P2(ResetAndRunCallback, callback, param) {
}
MATCHER(IsEndOfStream, "end of stream") {
- return (arg->IsEndOfStream());
+ return arg->end_of_stream();
}
} // namespace
@@ -129,7 +129,7 @@ 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())
+ else if (decrypted_buffer->end_of_stream())
EXPECT_CALL(*this, BufferReady(status, IsEndOfStream()));
else
EXPECT_CALL(*this, BufferReady(status, decrypted_buffer));
« no previous file with comments | « media/filters/decrypting_demuxer_stream.cc ('k') | media/filters/decrypting_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698