Decryptors can report kNoKey to WebMediaPlayer

media/base/mock_filters.h

Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index c8d1c822ee857f467250ed7c9f5afc9ceaf8b26a..496df028114568ea1a1021e01f320c2effd8cad5 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -82,10 +82,12 @@ class MockVideoDecoder : public VideoDecoder {
 
   // VideoDecoder implementation.
   virtual std::string GetDisplayName() const;
-  MOCK_METHOD4(Initialize, void(const VideoDecoderConfig& config,
-                                bool low_delay,
-                                const PipelineStatusCB& status_cb,
-                                const OutputCB& output_cb));
+  MOCK_METHOD5(Initialize,
+               void(const VideoDecoderConfig& config,
+                    bool low_delay,
+                    const PipelineStatusCB& status_cb,
+                    const OutputCB& output_cb,
+                    const base::Closure& waiting_for_encryption_key_cb));
   MOCK_METHOD2(Decode, void(const scoped_refptr<DecoderBuffer>& buffer,
                             const DecodeCB&));
   MOCK_METHOD1(Reset, void(const base::Closure&));
@@ -102,10 +104,11 @@ class MockAudioDecoder : public AudioDecoder {
 
   // AudioDecoder implementation.
   virtual std::string GetDisplayName() const;
-  MOCK_METHOD3(Initialize,
+  MOCK_METHOD4(Initialize,
                void(const AudioDecoderConfig& config,
                     const PipelineStatusCB& status_cb,
-                    const OutputCB& output_cb));
+                    const OutputCB& output_cb,
+                    const base::Closure& waiting_for_encryption_key_cb));
   MOCK_METHOD2(Decode,
                void(const scoped_refptr<DecoderBuffer>& buffer,
                     const DecodeCB&));
@@ -121,16 +124,17 @@ class MockVideoRenderer : public VideoRenderer {
   virtual ~MockVideoRenderer();
 
   // VideoRenderer implementation.
-  MOCK_METHOD9(Initialize,
-               void(DemuxerStream* stream,
-                    const PipelineStatusCB& init_cb,
-                    const SetDecryptorReadyCB& set_decryptor_ready_cb,
-                    const StatisticsCB& statistics_cb,
-                    const BufferingStateCB& buffering_state_cb,
-                    const PaintCB& paint_cb,
-                    const base::Closure& ended_cb,
-                    const PipelineStatusCB& error_cb,
-                    const TimeDeltaCB& get_time_cb));
+  MOCK_METHOD10(Initialize,
+                void(DemuxerStream* stream,
+                     const PipelineStatusCB& init_cb,
+                     const SetDecryptorReadyCB& set_decryptor_ready_cb,
+                     const StatisticsCB& statistics_cb,
+                     const BufferingStateCB& buffering_state_cb,
+                     const PaintCB& paint_cb,
+                     const base::Closure& ended_cb,
+                     const PipelineStatusCB& error_cb,
+                     const TimeDeltaCB& get_time_cb,
+                     const base::Closure& waiting_for_encryption_key_cb));
   MOCK_METHOD1(Flush, void(const base::Closure& callback));
   MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta));
 
@@ -144,14 +148,15 @@ class MockAudioRenderer : public AudioRenderer {
   virtual ~MockAudioRenderer();
 
   // AudioRenderer implementation.
-  MOCK_METHOD7(Initialize,
+  MOCK_METHOD8(Initialize,
                void(DemuxerStream* stream,
                     const PipelineStatusCB& init_cb,
                     const SetDecryptorReadyCB& set_decryptor_ready_cb,
                     const StatisticsCB& statistics_cb,
                     const BufferingStateCB& buffering_state_cb,
                     const base::Closure& ended_cb,
-                    const PipelineStatusCB& error_cb));
+                    const PipelineStatusCB& error_cb,
+                    const base::Closure& waiting_for_encryption_key_cb));
   MOCK_METHOD0(GetTimeSource, TimeSource*());
   MOCK_METHOD1(Flush, void(const base::Closure& callback));
   MOCK_METHOD0(StartPlaying, void());
@@ -167,13 +172,15 @@ class MockRenderer : public Renderer {
   virtual ~MockRenderer();
 
   // Renderer implementation.
-  MOCK_METHOD7(Initialize, void(DemuxerStreamProvider* demuxer_stream_provider,
-                                const PipelineStatusCB& init_cb,
-                                const StatisticsCB& statistics_cb,
-                                const BufferingStateCB& buffering_state_cb,
-                                const PaintCB& paint_cb,
-                                const base::Closure& ended_cb,
-                                const PipelineStatusCB& error_cb));
+  MOCK_METHOD8(Initialize,
+               void(DemuxerStreamProvider* demuxer_stream_provider,
+                    const PipelineStatusCB& init_cb,
+                    const StatisticsCB& statistics_cb,
+                    const BufferingStateCB& buffering_state_cb,
+                    const PaintCB& paint_cb,
+                    const base::Closure& ended_cb,
+                    const PipelineStatusCB& error_cb,
+                    const base::Closure& waiting_for_encryption_key_cb));
   MOCK_METHOD1(Flush, void(const base::Closure& flush_cb));
   MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta timestamp));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));