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 7910ef1b4e3069c77d2a1625f14962224b37de4c..2f07e231c03b2c98a16217297e59cd1c6c4f8922 100644 |
--- a/media/filters/decrypting_audio_decoder_unittest.cc |
+++ b/media/filters/decrypting_audio_decoder_unittest.cc |
@@ -84,10 +84,6 @@ |
decoded_frame_list_() { |
} |
- virtual ~DecryptingAudioDecoderTest() { |
- Stop(); |
- } |
- |
void InitializeAndExpectStatus(const AudioDecoderConfig& config, |
PipelineStatus status) { |
// Initialize data now that the config is known. Since the code uses |
@@ -212,34 +208,12 @@ |
} |
} |
- void AbortAllPendingCBs() { |
- if (!pending_init_cb_.is_null()) { |
- ASSERT_TRUE(pending_audio_decode_cb_.is_null()); |
- base::ResetAndReturn(&pending_init_cb_).Run(false); |
- return; |
- } |
- |
- AbortPendingAudioDecodeCB(); |
- } |
- |
void Reset() { |
EXPECT_CALL(*decryptor_, ResetDecoder(Decryptor::kAudio)) |
.WillRepeatedly(InvokeWithoutArgs( |
this, &DecryptingAudioDecoderTest::AbortPendingAudioDecodeCB)); |
decoder_->Reset(NewExpectedClosure()); |
- message_loop_.RunUntilIdle(); |
- } |
- |
- void Stop() { |
- EXPECT_CALL(*decryptor_, RegisterNewKeyCB(Decryptor::kAudio, |
- IsNullCallback())) |
- .Times(AtMost(1)); |
- EXPECT_CALL(*decryptor_, DeinitializeDecoder(Decryptor::kAudio)) |
- .WillRepeatedly(InvokeWithoutArgs( |
- this, &DecryptingAudioDecoderTest::AbortAllPendingCBs)); |
- |
- decoder_->Stop(NewExpectedClosure()); |
message_loop_.RunUntilIdle(); |
} |