media/filters/video_decoder_selector_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/video_decoder_selector_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: rebase again 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

Index: media/filters/video_decoder_selector_unittest.cc

diff --git a/media/filters/video_decoder_selector_unittest.cc b/media/filters/video_decoder_selector_unittest.cc

index dcf390d1260c53508524ec4e758e6bc6f167d4c0..9ca8c85c10057742454c03973c2f490df1720246 100644

--- a/media/filters/video_decoder_selector_unittest.cc

+++ b/media/filters/video_decoder_selector_unittest.cc

@@ -129,7 +129,7 @@ class VideoDecoderSelectorTest : public ::testing::Test {

VideoDecoderConfig encrypted_video_config_;

scoped_refptr<StrictMock<MockDemuxerStream> > demuxer_stream_;

// Use NiceMock since we don't care about most of calls on the decryptor, e.g.

- // RegisterKeyAddedCB().

+ // RegisterNewKeyCB().

scoped_ptr<NiceMock<MockDecryptor> > decryptor_;

scoped_refptr<StrictMock<MockVideoDecoder> > decoder_1_;

scoped_refptr<StrictMock<MockVideoDecoder> > decoder_2_;

« media/base/decryptor.h ('K') | « media/filters/pipeline_integration_test.cc ('k') | media/media.gyp » ('j') | no next file with comments »