media/filters/decrypting_demuxer_stream_unittest.cc - Issue 11226019: Encrypted Media: Replace DecryptorClient with key event callbacks.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/decrypting_demuxer_stream_unittest.cc

Issue 11226019: Encrypted Media: Replace DecryptorClient with key event callbacks. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: tests updated; ready for review Created 8 years 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

« media/crypto/aes_decryptor.h ('K') | « media/filters/decrypting_demuxer_stream.cc ('k') | media/filters/decrypting_video_decoder.cc » ('j') | media/filters/decrypting_video_decoder_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 e1f13bd84b0211fdbc4dcb7bc0b2ea3d0d30f03c..0b61ea53d7c0e53f74ec3bcc56da8d016c69777e 100644

--- a/media/filters/decrypting_demuxer_stream_unittest.cc

+++ b/media/filters/decrypting_demuxer_stream_unittest.cc

@@ -115,7 +115,7 @@ class DecryptingDemuxerStreamTest : public testing::Test {

void Initialize() {

EXPECT_CALL(*this, RequestDecryptorNotification(_))

.WillOnce(RunCallbackIfNotNull(decryptor_.get()));

- EXPECT_CALL(*decryptor_, RegisterKeyAddedCB(Decryptor::kAudio, _))

+ EXPECT_CALL(*decryptor_, RegisterNewKeyCB(Decryptor::kAudio, _))

.WillOnce(SaveArg<1>(&key_added_cb_));

AudioDecoderConfig input_config(

@@ -222,7 +222,7 @@ class DecryptingDemuxerStreamTest : public testing::Test {

scoped_refptr<StrictMock<MockDemuxerStream> > input_video_stream_;

DemuxerStream::ReadCB pending_demuxer_read_cb_;

- Decryptor::KeyAddedCB key_added_cb_;

+ Decryptor::NewKeyCB key_added_cb_;

Decryptor::DecryptCB pending_decrypt_cb_;

// Constant buffers to be returned by the input demuxer streams and the

@@ -257,7 +257,7 @@ TEST_F(DecryptingDemuxerStreamTest, Initialize_InvalidAudioConfig) {

TEST_F(DecryptingDemuxerStreamTest, Initialize_NormalVideo) {

EXPECT_CALL(*this, RequestDecryptorNotification(_))

.WillOnce(RunCallbackIfNotNull(decryptor_.get()));

- EXPECT_CALL(*decryptor_, RegisterKeyAddedCB(Decryptor::kVideo, _))

+ EXPECT_CALL(*decryptor_, RegisterNewKeyCB(Decryptor::kVideo, _))

.WillOnce(SaveArg<1>(&key_added_cb_));

VideoDecoderConfig config(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN,