Encrypted Media: Replace DecryptorClient with key event callbacks.

webkit/media/crypto/ppapi_decryptor.cc

Index: webkit/media/crypto/ppapi_decryptor.cc
diff --git a/webkit/media/crypto/ppapi_decryptor.cc b/webkit/media/crypto/ppapi_decryptor.cc
index 9fecb8b533d6b9e88a9e04470961c66e6aede426..90b4ae7dfd3899fbfe394c8aefb1b60015589f6c 100644
--- a/webkit/media/crypto/ppapi_decryptor.cc
+++ b/webkit/media/crypto/ppapi_decryptor.cc
@@ -117,7 +117,7 @@ void PpapiDecryptor::CancelDecrypt(StreamType stream_type) {
 void PpapiDecryptor::InitializeAudioDecoder(
       scoped_ptr<media::AudioDecoderConfig> config,
       const DecoderInitCB& init_cb,
-      const KeyAddedCB& key_added_cb) {
+      const OnKeyAddedCB& key_added_cb) {
   if (!render_loop_proxy_->BelongsToCurrentThread()) {
     render_loop_proxy_->PostTask(FROM_HERE, base::Bind(
         &PpapiDecryptor::InitializeAudioDecoder, weak_this_,
@@ -148,7 +148,7 @@ void PpapiDecryptor::InitializeAudioDecoder(
 void PpapiDecryptor::InitializeVideoDecoder(
     scoped_ptr<media::VideoDecoderConfig> config,
     const DecoderInitCB& init_cb,
-    const KeyAddedCB& key_added_cb) {
+    const OnKeyAddedCB& key_added_cb) {
   if (!render_loop_proxy_->BelongsToCurrentThread()) {
     render_loop_proxy_->PostTask(FROM_HERE, base::Bind(
         &PpapiDecryptor::InitializeVideoDecoder, weak_this_,
@@ -233,7 +233,7 @@ void PpapiDecryptor::ReportFailureToCallPlugin(const std::string& key_system,
 }
 
 void PpapiDecryptor::OnDecoderInitialized(StreamType stream_type,
-                                          const KeyAddedCB& key_added_cb,
+                                          const OnKeyAddedCB& key_added_cb,
                                           bool success) {
   DCHECK(!key_added_cb.is_null());