Decryptors can report kNoKey to WebMediaPlayer

media/filters/decoder_stream.cc

Index: media/filters/decoder_stream.cc
diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc
index f9fa8b2d8d7f2354a625412ff4e92b2edbdb2e38..b1cceb8677b1aa336e594b77fd922f2c03519355 100644
--- a/media/filters/decoder_stream.cc
+++ b/media/filters/decoder_stream.cc
@@ -83,7 +83,8 @@ void DecoderStream<StreamType>::Initialize(
     DemuxerStream* stream,
     const InitCB& init_cb,
     const SetDecryptorReadyCB& set_decryptor_ready_cb,
-    const StatisticsCB& statistics_cb) {
+    const StatisticsCB& statistics_cb,
+    const base::Closure& waiting_for_encryption_key_cb) {
   FUNCTION_DVLOG(2);
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, STATE_UNINITIALIZED);
@@ -92,6 +93,7 @@ void DecoderStream<StreamType>::Initialize(
 
   statistics_cb_ = statistics_cb;
   init_cb_ = init_cb;
+  waiting_for_encryption_key_cb_ = waiting_for_encryption_key_cb;
   stream_ = stream;
 
   state_ = STATE_INITIALIZING;
@@ -212,7 +214,8 @@ void DecoderStream<StreamType>::SelectDecoder(
       base::Bind(&DecoderStream<StreamType>::OnDecoderSelected,
                  weak_factory_.GetWeakPtr()),
       base::Bind(&DecoderStream<StreamType>::OnDecodeOutputReady,
-                 weak_factory_.GetWeakPtr()));
+                 weak_factory_.GetWeakPtr()),
+      waiting_for_encryption_key_cb_);
 }
 
 template <DemuxerStream::Type StreamType>
@@ -500,7 +503,8 @@ void DecoderStream<StreamType>::ReinitializeDecoder() {
       base::Bind(&DecoderStream<StreamType>::OnDecoderReinitialized,
                  weak_factory_.GetWeakPtr()),
       base::Bind(&DecoderStream<StreamType>::OnDecodeOutputReady,
-                 weak_factory_.GetWeakPtr()));
+                 weak_factory_.GetWeakPtr()),
+      waiting_for_encryption_key_cb_);
 }
 
 template <DemuxerStream::Type StreamType>