Encrypted Media: Replace DecryptorClient with key event callbacks.

media/crypto/aes_decryptor.h

Index: media/crypto/aes_decryptor.h
diff --git a/media/crypto/aes_decryptor.h b/media/crypto/aes_decryptor.h
index 53fb813ef6bab4fb0961a5dea4c0e12225e456b5..f48553c37e090c86a7ecd27ed5bcc994ca11add3 100644
--- a/media/crypto/aes_decryptor.h
+++ b/media/crypto/aes_decryptor.h
@@ -49,12 +49,14 @@ class MEDIA_EXPORT AesDecryptor : public Decryptor {
                        const scoped_refptr<DecoderBuffer>& encrypted,
                        const DecryptCB& decrypt_cb) OVERRIDE;
   virtual void CancelDecrypt(StreamType stream_type) OVERRIDE;
-  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;
   virtual void DecryptAndDecodeAudio(
       const scoped_refptr<DecoderBuffer>& encrypted,
       const AudioDecodeCB& audio_decode_cb) OVERRIDE;