Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1567)

Unified Diff: media/base/mock_filters.h

Issue 1666653002: media: Remove SetCdmReadyCB and CdmReadyCB (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and fix compile errors Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/audio_renderer.h ('k') | media/base/test_helpers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 39c8f3b7e331444d227e6fd8d301c6d67ae0928e..256abc310d735fd33df87ad75d14ff1fbcc3d76a 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -91,7 +91,7 @@ class MockVideoDecoder : public VideoDecoder {
MOCK_METHOD5(Initialize,
void(const VideoDecoderConfig& config,
bool low_delay,
- const SetCdmReadyCB& set_cdm_ready_cb,
+ CdmContext* cdm_context,
const InitCB& init_cb,
const OutputCB& output_cb));
MOCK_METHOD2(Decode, void(const scoped_refptr<DecoderBuffer>& buffer,
@@ -112,7 +112,7 @@ class MockAudioDecoder : public AudioDecoder {
virtual std::string GetDisplayName() const;
MOCK_METHOD4(Initialize,
void(const AudioDecoderConfig& config,
- const SetCdmReadyCB& set_cdm_ready_cb,
+ CdmContext* cdm_context,
const InitCB& init_cb,
const OutputCB& output_cb));
MOCK_METHOD2(Decode,
@@ -133,7 +133,7 @@ class MockVideoRenderer : public VideoRenderer {
MOCK_METHOD9(Initialize,
void(DemuxerStream* stream,
const PipelineStatusCB& init_cb,
- const SetCdmReadyCB& set_cdm_ready_cb,
+ CdmContext* cdm_context,
const StatisticsCB& statistics_cb,
const BufferingStateCB& buffering_state_cb,
const base::Closure& ended_cb,
@@ -157,7 +157,7 @@ class MockAudioRenderer : public AudioRenderer {
MOCK_METHOD8(Initialize,
void(DemuxerStream* stream,
const PipelineStatusCB& init_cb,
- const SetCdmReadyCB& set_cdm_ready_cb,
+ CdmContext* cdm_context,
const StatisticsCB& statistics_cb,
const BufferingStateCB& buffering_state_cb,
const base::Closure& ended_cb,
« no previous file with comments | « media/base/audio_renderer.h ('k') | media/base/test_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698