Index: media/filters/decrypting_video_decoder.cc |
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc |
index 3a869440d4f1e52e6f8cca1b79db9699b363bfa6..4f379d96fa2b242cca9545b742437d60bdb0f5c6 100644 |
--- a/media/filters/decrypting_video_decoder.cc |
+++ b/media/filters/decrypting_video_decoder.cc |
@@ -52,6 +52,7 @@ void DecryptingVideoDecoder::Initialize(const VideoDecoderConfig& config, |
DCHECK(decode_cb_.is_null()); |
DCHECK(reset_cb_.is_null()); |
DCHECK(config.IsValidConfig()); |
+ DCHECK(cdm_context); |
init_cb_ = BindToCurrentLoop(init_cb); |
output_cb_ = BindToCurrentLoop(output_cb); |
@@ -59,11 +60,6 @@ void DecryptingVideoDecoder::Initialize(const VideoDecoderConfig& config, |
config_ = config; |
if (state_ == kUninitialized) { |
- // DecoderSelector only chooses |this| when the stream is encrypted. |
- // TODO(xhwang): We may also select this decoder for clear stream if a CDM |
- // is attached. Then we need to update this. See http://crbug.com/597443 |
- DCHECK(config.is_encrypted()); |
- DCHECK(cdm_context); |
if (!cdm_context->GetDecryptor()) { |
MEDIA_LOG(DEBUG, media_log_) << GetDisplayName() << ": no decryptor"; |
base::ResetAndReturn(&init_cb_).Run(false); |