Encrypted Media: Replace DecryptorClient with key event callbacks.

webkit/plugins/ppapi/content_decryptor_delegate.h

Index: webkit/plugins/ppapi/content_decryptor_delegate.h
diff --git a/webkit/plugins/ppapi/content_decryptor_delegate.h b/webkit/plugins/ppapi/content_decryptor_delegate.h
index 6e6f3c112b0fcebbd7ed4ba86e9117c876b94a36..c1af7997217180c8a6ef719b735e99b042b46429 100644
--- a/webkit/plugins/ppapi/content_decryptor_delegate.h
+++ b/webkit/plugins/ppapi/content_decryptor_delegate.h
@@ -21,7 +21,6 @@
 namespace media {
 class AudioDecoderConfig;
 class DecoderBuffer;
-class DecryptorClient;
 class VideoDecoderConfig;
 }
 
@@ -39,8 +38,12 @@ class WEBKIT_PLUGINS_EXPORT ContentDecryptorDelegate {
       PP_Instance pp_instance,
       const PPP_ContentDecryptor_Private* plugin_decryption_interface);
 
+  void SetKeyEventCallbacks(const media::KeyAddedCB& key_added_cb,
+                            const media::KeyErrorCB& key_error_cb,
+                            const media::KeyMessageCB& key_message_cb,
+                            const media::NeedKeyCB& need_key_cb);
+
   // Provides access to PPP_ContentDecryptor_Private.
-  void set_decrypt_client(media::DecryptorClient* decryptor_client);
   bool GenerateKeyRequest(const std::string& key_system,
                           const std::string& type,
                           const uint8* init_data,
@@ -121,7 +124,11 @@ class WEBKIT_PLUGINS_EXPORT ContentDecryptorDelegate {
   const PP_Instance pp_instance_;
   const PPP_ContentDecryptor_Private* const plugin_decryption_interface_;
 
-  media::DecryptorClient* decryptor_client_;
+  // Callbacks for firing key events.
+  media::KeyAddedCB key_added_cb_;
+  media::KeyErrorCB key_error_cb_;
+  media::KeyMessageCB key_message_cb_;
+  media::NeedKeyCB need_key_cb_;
 
   gfx::Size natural_size_;