Index: media/filters/pipeline_integration_test_base.h |
diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h |
index c98d82cc484e098614f17899a769281a4cb20f5f..1c8b5d6bcfc870cbc7646543f30ca1bde3fc78c6 100644 |
--- a/media/filters/pipeline_integration_test_base.h |
+++ b/media/filters/pipeline_integration_test_base.h |
@@ -107,7 +107,7 @@ class PipelineIntegrationTestBase { |
scoped_refptr<ClocklessAudioSink> clockless_audio_sink_; |
bool ended_; |
PipelineStatus pipeline_status_; |
- Demuxer::NeedKeyCB need_key_cb_; |
+ Demuxer::EncryptedMediaInitDataCB encrypted_media_init_data_cb_; |
VideoFrame::Format last_video_frame_format_; |
DummyTickClock dummy_clock_; |
AudioHardwareConfig hardware_config_; |
@@ -115,10 +115,11 @@ class PipelineIntegrationTestBase { |
void OnSeeked(base::TimeDelta seek_time, PipelineStatus status); |
void OnStatusCallback(PipelineStatus status); |
- void DemuxerNeedKeyCB(const std::string& type, |
- const std::vector<uint8>& init_data); |
- void set_need_key_cb(const Demuxer::NeedKeyCB& need_key_cb) { |
- need_key_cb_ = need_key_cb; |
+ void DemuxerEncryptedMediaInitDataCB(const std::string& type, |
+ const std::vector<uint8>& init_data); |
+ void set_encrypted_media_init_data_cb( |
+ const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) { |
+ encrypted_media_init_data_cb_ = encrypted_media_init_data_cb; |
} |
void OnEnded(); |