Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(825)

Unified Diff: media/filters/decrypting_audio_decoder_unittest.cc

Issue 139513007: Revert of Add Stop() to AudioDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/decrypting_audio_decoder.cc ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « media/filters/decrypting_audio_decoder.cc ('k') | media/filters/ffmpeg_audio_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698