Index: media/filters/decrypting_audio_decoder.h |
diff --git a/media/filters/decrypting_audio_decoder.h b/media/filters/decrypting_audio_decoder.h |
index 40995a46353d43374ece2d89ba08dfc50fd97f56..6092d4744ad81d778d46fcaf5f4165107724f403 100644 |
--- a/media/filters/decrypting_audio_decoder.h |
+++ b/media/filters/decrypting_audio_decoder.h |
@@ -31,21 +31,9 @@ class Decryptor; |
// DecryptingAudioDecoder for audio decoding. |
class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder { |
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; |
- |
DecryptingAudioDecoder( |
const scoped_refptr<base::MessageLoopProxy>& message_loop, |
- const RequestDecryptorNotificationCB& request_decryptor_notification_cb); |
+ const SetDecryptorReadyCB& set_decryptor_ready_cb); |
// AudioDecoder implementation. |
virtual void Initialize(const scoped_refptr<DemuxerStream>& stream, |
@@ -135,7 +123,7 @@ class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder { |
scoped_refptr<DemuxerStream> demuxer_stream_; |
// Callback to request/cancel decryptor creation notification. |
- RequestDecryptorNotificationCB request_decryptor_notification_cb_; |
+ SetDecryptorReadyCB set_decryptor_ready_cb_; |
Decryptor* decryptor_; |