Index: media/filters/decrypting_demuxer_stream.h |
diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h |
index bb86dec36e553e4923481cfc37263aaf7078c102..73ba1fb5aad34fd4182c8edf5ff5fb9e604e9306 100644 |
--- a/media/filters/decrypting_demuxer_stream.h |
+++ b/media/filters/decrypting_demuxer_stream.h |
@@ -24,22 +24,9 @@ class DecoderBuffer; |
// that no locks are required for thread safety. |
class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream { |
public: |
- // Callback to notify decryptor creation. |
- typedef base::Callback<void(Decryptor*)> DecryptorNotificationCB; |
- |
- // Callback to request/cancel decryptor creation notification. |
- // Calling this callback with a non-null callback registers decryptor creation |
- // notification. When the decryptor is created, notification will be sent |
- // through the provided callback. |
- // Calling this callback with a null callback cancels previously registered |
- // decryptor creation notification. Any previously provided callback will be |
- // fired immediately with NULL. |
- typedef base::Callback<void(const DecryptorNotificationCB&)> |
- RequestDecryptorNotificationCB; |
- |
DecryptingDemuxerStream( |
const scoped_refptr<base::MessageLoopProxy>& message_loop, |
- const RequestDecryptorNotificationCB& request_decryptor_notification_cb); |
+ const SetDecryptorReadyCB& set_decryptor_ready_cb); |
void Initialize(const scoped_refptr<DemuxerStream>& stream, |
const PipelineStatusCB& status_cb); |
@@ -120,7 +107,7 @@ class MEDIA_EXPORT DecryptingDemuxerStream : public DemuxerStream { |
scoped_ptr<VideoDecoderConfig> video_config_; |
// Callback to request/cancel decryptor creation notification. |
- RequestDecryptorNotificationCB request_decryptor_notification_cb_; |
+ SetDecryptorReadyCB set_decryptor_ready_cb_; |
Decryptor* decryptor_; |