media/filters/decrypting_demuxer_stream_unittest.cc - Issue 167333004: Encrypted Media: No need to cancel NewKeyCB during tear down.

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 167333004: Encrypted Media: No need to cancel NewKeyCB during tear down. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: comments addressed Created 6 years, 10 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:

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 bfb221997dd8508cf91670f625e864f187ce2899..14485c0e4eb6bb51d1559499e95f90b3174a595d 100644

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

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

@@ -113,9 +113,8 @@ class DecryptingDemuxerStreamTest : public testing::Test {

void Initialize() {

EXPECT_CALL(*this, RequestDecryptorNotification(_))

.WillOnce(SetDecryptorIfNotNull(decryptor_.get(), &is_decryptor_set_));

- // TODO(xhwang): Use WillOnce after we remove the cancellation of NewKeyCB.

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

- .WillRepeatedly(SaveArg<1>(&key_added_cb_));

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

AudioDecoderConfig input_config(

kCodecVorbis, kSampleFormatPlanarF32, CHANNEL_LAYOUT_STEREO, 44100,