Encrypted Media: Replace DecryptorClient with key event callbacks.

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 518a180ee9301490b882f8b877cbfbfde6bd47ee..74bb7d64d2efca49195cb056111d737bdf84c710 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -217,11 +217,11 @@ class MockDecryptor : public Decryptor {
   MOCK_METHOD3(InitializeAudioDecoderMock,
                void(const AudioDecoderConfig& config,
                     const DecoderInitCB& init_cb,
-                    const KeyAddedCB& key_added_cb));
+                    const OnKeyAddedCB& key_added_cb));
   MOCK_METHOD3(InitializeVideoDecoderMock,
                void(const VideoDecoderConfig& config,
                     const DecoderInitCB& init_cb,
-                    const KeyAddedCB& key_added_cb));
+                    const OnKeyAddedCB& key_added_cb));
   MOCK_METHOD2(DecryptAndDecodeAudio,
                void(const scoped_refptr<media::DecoderBuffer>& encrypted,
                     const AudioDecodeCB& audio_decode_cb));
@@ -231,12 +231,14 @@ class MockDecryptor : public Decryptor {
   MOCK_METHOD1(ResetDecoder, void(StreamType stream_type));
   MOCK_METHOD1(DeinitializeDecoder, void(StreamType stream_type));
 
-  virtual void InitializeAudioDecoder(scoped_ptr<AudioDecoderConfig> config,
-                                      const DecoderInitCB& init_cb,
-                                      const KeyAddedCB& key_added_cb) OVERRIDE;
-  virtual void InitializeVideoDecoder(scoped_ptr<VideoDecoderConfig> config,
-                                      const DecoderInitCB& init_cb,
-                                      const KeyAddedCB& key_added_cb) OVERRIDE;
+  virtual void InitializeAudioDecoder(
+      scoped_ptr<AudioDecoderConfig> config,
+      const DecoderInitCB& init_cb,
+      const OnKeyAddedCB& key_added_cb) OVERRIDE;
+  virtual void InitializeVideoDecoder(
+      scoped_ptr<VideoDecoderConfig> config,
+      const DecoderInitCB& init_cb,
+      const OnKeyAddedCB& key_added_cb) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDecryptor);