media/filters/pipeline_integration_test_base.cc - Issue 17289006: Separate CDM initialization from GenerateKeyRequest & remove key_system parameters.

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/filters/pipeline_integration_test_base.cc

Issue 17289006: Separate CDM initialization from GenerateKeyRequest & remove key_system parameters. (Closed) Base URL: master

Patch Set: rebase only Created 7 years, 6 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:

Index: media/filters/pipeline_integration_test_base.cc

diff --git a/media/filters/pipeline_integration_test_base.cc b/media/filters/pipeline_integration_test_base.cc

index 7e1e59b79652897416a263ba77548973ae9c1c7c..8ba90196c0e3251dacf57414ddce131d3eac07c7 100644

--- a/media/filters/pipeline_integration_test_base.cc

+++ b/media/filters/pipeline_integration_test_base.cc

@@ -69,8 +69,7 @@ void PipelineIntegrationTestBase::DemuxerNeedKeyCB(

DCHECK(init_data.get());

DCHECK_GT(init_data_size, 0);

CHECK(!need_key_cb_.is_null());

- need_key_cb_.Run(

- std::string(), std::string(), type, init_data.Pass(), init_data_size);

+ need_key_cb_.Run(std::string(), type, init_data.Pass(), init_data_size);

}

void PipelineIntegrationTestBase::OnEnded() {