Encrypted Media: Replace DecryptorClient with key event callbacks.

webkit/plugins/ppapi/content_decryptor_delegate.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
 #define WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_
 
 #include <queue>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/decryptor.h"
 #include "ppapi/c/private/pp_content_decryptor.h"
 #include "ppapi/c/private/ppp_content_decryptor_private.h"
 #include "ui/gfx/size.h"
 #include "webkit/plugins/webkit_plugins_export.h"
 
 namespace media {
 class AudioDecoderConfig;
 class DecoderBuffer;
-class DecryptorClient;
 class VideoDecoderConfig;
 }
 
 namespace webkit {
 namespace ppapi {
 
 class PPB_Buffer_Impl;
 
 class WEBKIT_PLUGINS_EXPORT ContentDecryptorDelegate {
  public:
   // ContentDecryptorDelegate does not take ownership of
   // |plugin_decryption_interface|. Therefore |plugin_decryption_interface|
   // must outlive this object.
   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,
                           int init_data_length);
   bool AddKey(const std::string& session_id,
               const uint8* key,
               int key_length,
               const uint8* init_data,
               int init_data_length);
   bool CancelKeyRequest(const std::string& session_id);
@@ skipping 60 matching lines @@
                                const uint8* data, uint32_t size,
                                scoped_refptr<PPB_Buffer_Impl>* resource);
 
   void FreeBuffer(uint32_t buffer_id);
 
   void SetBufferToFreeInTrackingInfo(PP_DecryptTrackingInfo* tracking_info);
 
   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_;
 
   // Request ID for tracking pending content decryption callbacks.
   // Note that zero indicates an invalid request ID.
   // TODO(xhwang): Add completion callbacks for Reset/Stop and remove the use
   // of request IDs.
   uint32_t next_decryption_request_id_;
 
   uint32_t pending_audio_decrypt_request_id_;
@@ skipping 23 matching lines @@
   base::WeakPtrFactory<ContentDecryptorDelegate> weak_ptr_factory_;
   base::WeakPtr<ContentDecryptorDelegate> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentDecryptorDelegate);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_CONTENT_DECRYPTOR_DELEGATE_H_