media/filters/decrypting_audio_decoder_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_audio_decoder_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_audio_decoder_unittest.cc

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

index 050bcf8555bed458befaba2103c2fc857a790eb2..deb917d1acb0e53ee6873a34febbf8319ad77d1d 100644

--- a/media/filters/decrypting_audio_decoder_unittest.cc

+++ b/media/filters/decrypting_audio_decoder_unittest.cc

@@ -231,9 +231,6 @@ class DecryptingAudioDecoderTest : public testing::Test {

}

void Stop() {

- EXPECT_CALL(*decryptor_, RegisterNewKeyCB(Decryptor::kAudio,

- IsNullCallback()))

- .Times(AtMost(1));

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

.WillRepeatedly(InvokeWithoutArgs(

this, &DecryptingAudioDecoderTest::AbortAllPendingCBs));