| Index: media/filters/decrypting_video_decoder.cc
|
| diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
|
| index 1f65368370c48149e529511f9c7e51348fc37adf..4f379d96fa2b242cca9545b742437d60bdb0f5c6 100644
|
| --- a/media/filters/decrypting_video_decoder.cc
|
| +++ b/media/filters/decrypting_video_decoder.cc
|
| @@ -115,16 +115,11 @@ void DecryptingVideoDecoder::Reset(const base::Closure& closure) {
|
| state_ == kWaitingForKey ||
|
| state_ == kDecodeFinished ||
|
| state_ == kError) << state_;
|
| + DCHECK(init_cb_.is_null()); // No Reset() during pending initialization.
|
| DCHECK(reset_cb_.is_null());
|
|
|
| reset_cb_ = BindToCurrentLoop(closure);
|
|
|
| - // TODO(xhwang): These CHECKs are used to help investigate a bug. Remove them
|
| - // after the investigation is over. See http://crbug.com/695554
|
| - CHECK(state_ != kUninitialized);
|
| - CHECK(state_ != kPendingDecoderInit);
|
| - CHECK(init_cb_.is_null()); // No Reset() during pending initialization.
|
| -
|
| decryptor_->ResetDecoder(Decryptor::kVideo);
|
|
|
| // Reset() cannot complete if the decode callback is still pending.
|
|
|