Index: media/filters/decrypting_video_decoder.cc |
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc |
index 2651c5da7404031a82f2453a542f737f7f48ab04..c5fdf3b17cf22eaac26cbef3f8498ce780e76669 100644 |
--- a/media/filters/decrypting_video_decoder.cc |
+++ b/media/filters/decrypting_video_decoder.cc |
@@ -146,7 +146,8 @@ DecryptingVideoDecoder::~DecryptingVideoDecoder() { |
base::ResetAndReturn(&reset_cb_).Run(); |
} |
-void DecryptingVideoDecoder::SetDecryptor(Decryptor* decryptor) { |
+void DecryptingVideoDecoder::SetDecryptor(Decryptor* decryptor, |
+ const base::Closure& done_cb) { |
DVLOG(2) << "SetDecryptor()"; |
DCHECK(task_runner_->BelongsToCurrentThread()); |
DCHECK_EQ(state_, kDecryptorRequested) << state_; |
@@ -157,6 +158,7 @@ void DecryptingVideoDecoder::SetDecryptor(Decryptor* decryptor) { |
if (!decryptor) { |
base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED); |
state_ = kError; |
+ done_cb.Run(); |
ddorwin
2014/07/30 22:35:46
ditto
|
return; |
} |
@@ -167,6 +169,7 @@ void DecryptingVideoDecoder::SetDecryptor(Decryptor* decryptor) { |
config_, |
BindToCurrentLoop(base::Bind( |
&DecryptingVideoDecoder::FinishInitialization, weak_this_))); |
+ done_cb.Run(); |
} |
void DecryptingVideoDecoder::FinishInitialization(bool success) { |