media/base/mock_filters.h - Issue 1446713003: Revert of media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/base/mock_filters.h

Issue 1446713003: Revert of media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

Index: media/base/mock_filters.h

diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h

index c55843055a24d1209d3f9b2db75d74c6bb558055..5fb2a3e9e6c60775772fef061f6023682f1e1ad6 100644

--- a/media/base/mock_filters.h

+++ b/media/base/mock_filters.h

@@ -86,10 +86,9 @@

// VideoDecoder implementation.

virtual std::string GetDisplayName() const;

- MOCK_METHOD5(Initialize,

+ MOCK_METHOD4(Initialize,

void(const VideoDecoderConfig& config,

bool low_delay,

- const SetCdmReadyCB& set_cdm_ready_cb,

const InitCB& init_cb,

const OutputCB& output_cb));

MOCK_METHOD2(Decode, void(const scoped_refptr<DecoderBuffer>& buffer,

@@ -108,9 +107,8 @@

// AudioDecoder implementation.

virtual std::string GetDisplayName() const;

- MOCK_METHOD4(Initialize,

+ MOCK_METHOD3(Initialize,

void(const AudioDecoderConfig& config,

- const SetCdmReadyCB& set_cdm_ready_cb,

const InitCB& init_cb,

const OutputCB& output_cb));

MOCK_METHOD2(Decode,

« no previous file with comments | « media/base/audio_decoder.h ('k') | media/base/video_decoder.h » ('j') | no next file with comments »