Encrypted Media: Replace DecryptorClient with key event callbacks.

webkit/media/crypto/ppapi_decryptor.h

Index: webkit/media/crypto/ppapi_decryptor.h
diff --git a/webkit/media/crypto/ppapi_decryptor.h b/webkit/media/crypto/ppapi_decryptor.h
index b65eb19d39dc1d0f85430993d2d20ae0c1e78d0f..162769280742143ac992e68e941280d404aae2bc 100644
--- a/webkit/media/crypto/ppapi_decryptor.h
+++ b/webkit/media/crypto/ppapi_decryptor.h
@@ -57,11 +57,11 @@ class PpapiDecryptor : public media::Decryptor {
   virtual void InitializeAudioDecoder(
       scoped_ptr<media::AudioDecoderConfig> config,
       const DecoderInitCB& init_cb,
-      const KeyAddedCB& key_added_cb) OVERRIDE;
+      const OnKeyAddedCB& key_added_cb) OVERRIDE;
   virtual void InitializeVideoDecoder(
       scoped_ptr<media::VideoDecoderConfig> config,
       const DecoderInitCB& init_cb,
-      const KeyAddedCB& key_added_cb) OVERRIDE;
+      const OnKeyAddedCB& key_added_cb) OVERRIDE;
   virtual void DecryptAndDecodeAudio(
       const scoped_refptr<media::DecoderBuffer>& encrypted,
       const AudioDecodeCB& audio_decode_cb) OVERRIDE;
@@ -76,7 +76,7 @@ class PpapiDecryptor : public media::Decryptor {
                                  const std::string& session_id);
 
   void OnDecoderInitialized(StreamType stream_type,
-                            const KeyAddedCB& key_added_cb,
+                            const OnKeyAddedCB& key_added_cb,
                             bool success);
 
   media::DecryptorClient* client_;
@@ -85,8 +85,8 @@ class PpapiDecryptor : public media::Decryptor {
 
   DecoderInitCB audio_decoder_init_cb_;
   DecoderInitCB video_decoder_init_cb_;
-  KeyAddedCB audio_key_added_cb_;
-  KeyAddedCB video_key_added_cb_;
+  OnKeyAddedCB audio_key_added_cb_;
+  OnKeyAddedCB video_key_added_cb_;
 
   base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
   base::WeakPtr<PpapiDecryptor> weak_this_;