Decryptors can report kNoKey to WebMediaPlayer

media/filters/decoder_selector.cc

Index: media/filters/decoder_selector.cc
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc
index f026acdd1504ed953bf045469b5993066da45e32..aee3f38ef11e5bbd0372c62ff001a28beecbec06 100644
--- a/media/filters/decoder_selector.cc
+++ b/media/filters/decoder_selector.cc
@@ -75,13 +75,15 @@ void DecoderSelector<StreamType>::SelectDecoder(
     DemuxerStream* stream,
     const SetDecryptorReadyCB& set_decryptor_ready_cb,
     const SelectDecoderCB& select_decoder_cb,
-    const typename Decoder::OutputCB& output_cb) {
+    const typename Decoder::OutputCB& output_cb,
+    const base::Closure& waiting_for_encryption_key_cb) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(stream);
   DCHECK(select_decoder_cb_.is_null());
 
   set_decryptor_ready_cb_ = set_decryptor_ready_cb;
+  waiting_for_encryption_key_cb_ = waiting_for_encryption_key_cb;
 
   // Make sure |select_decoder_cb| runs on a different execution stack.
   select_decoder_cb_ = BindToCurrentLoop(select_decoder_cb);
@@ -113,7 +115,7 @@ void DecoderSelector<StreamType>::SelectDecoder(
       decoder_.get(), input_stream_,
       base::Bind(&DecoderSelector<StreamType>::DecryptingDecoderInitDone,
                  weak_ptr_factory_.GetWeakPtr()),
-      output_cb_);
+      output_cb_, waiting_for_encryption_key_cb_);
 }
 
 template <DemuxerStream::Type StreamType>
@@ -136,7 +138,8 @@ void DecoderSelector<StreamType>::DecryptingDecoderInitDone(
   decrypted_stream_->Initialize(
       input_stream_,
       base::Bind(&DecoderSelector<StreamType>::DecryptingDemuxerStreamInitDone,
-                 weak_ptr_factory_.GetWeakPtr()));
+                 weak_ptr_factory_.GetWeakPtr()),
+      waiting_for_encryption_key_cb_);
 }
 
 template <DemuxerStream::Type StreamType>
@@ -173,7 +176,7 @@ void DecoderSelector<StreamType>::InitializeDecoder() {
       decoder_.get(), input_stream_,
       base::Bind(&DecoderSelector<StreamType>::DecoderInitDone,
                  weak_ptr_factory_.GetWeakPtr()),
-      output_cb_);
+      output_cb_, waiting_for_encryption_key_cb_);
 }
 
 template <DemuxerStream::Type StreamType>