media/filters/decrypting_video_decoder_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_video_decoder_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_video_decoder.cc ('k') | media/filters/pipeline_integration_test.cc » ('j') | media/filters/pipeline_integration_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 a29d4448e4aaa889e9f9f5ebb7282a11156071d2..366ddbc700f76d5f267242b65237d19825516cc1 100644

--- a/media/filters/decrypting_video_decoder_unittest.cc

+++ b/media/filters/decrypting_video_decoder_unittest.cc

@@ -106,7 +106,7 @@ class DecryptingVideoDecoderTest : public testing::Test {

EXPECT_CALL(*decryptor_, InitializeVideoDecoderMock(_, _))

.Times(AtMost(1))

.WillOnce(RunCallback<1>(true));

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

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

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

config_.Initialize(kCodecVP8, VIDEO_CODEC_PROFILE_UNKNOWN, kVideoFormat,

@@ -218,7 +218,7 @@ class DecryptingVideoDecoderTest : public testing::Test {

}

void Stop() {

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

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

IsNullCallback()))

scherkus (not reviewing) 2012/12/20 15:18:55 indent

xhwang 2012/12/20 18:06:31 Done.

.Times(AtMost(1));

EXPECT_CALL(*decryptor_, DeinitializeDecoder(Decryptor::kVideo))

@@ -243,7 +243,7 @@ class DecryptingVideoDecoderTest : public testing::Test {

DemuxerStream::ReadCB pending_demuxer_read_cb_;

Decryptor::DecoderInitCB pending_init_cb_;

- Decryptor::KeyAddedCB key_added_cb_;

+ Decryptor::NewKeyCB key_added_cb_;

Decryptor::VideoDecodeCB pending_video_decode_cb_;

// Constant buffer/frames to be returned by the |demuxer_| and |decryptor_|.

« media/crypto/aes_decryptor.h ('K') | « media/filters/decrypting_video_decoder.cc ('k') | media/filters/pipeline_integration_test.cc » ('j') | media/filters/pipeline_integration_test.cc » ('J')