media/filters/pipeline_integration_test_base.cc - Issue 416333011: Allow setContentDecryptionModule() to get called when setting is done.

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 416333011: Allow setContentDecryptionModule() to get called when setting is done. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More changes Created 6 years, 4 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

« media/filters/audio_decoder_selector_unittest.cc ('K') | « media/filters/pipeline_integration_test_base.h ('k') | media/filters/video_decoder_selector_unittest.cc » ('j') | media/filters/video_decoder_selector_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 54e7f58aea6eabfc780e4f21d3fa376e0fd5d6bf..6a8843996c9c8070fd014fedde014af7192f5441 100644

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

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

@@ -20,6 +20,7 @@

using ::testing::_;

using ::testing::AnyNumber;

using ::testing::AtMost;

+using ::testing::Eq;

using ::testing::SaveArg;

namespace media {

@@ -307,7 +308,11 @@ PipelineIntegrationTestBase::CreateFilterCollection(

void PipelineIntegrationTestBase::SetDecryptor(

Decryptor* decryptor,

const DecryptorReadyCB& decryptor_ready_cb) {

- decryptor_ready_cb.Run(decryptor);

+ decryptor_ready_cb.Run(

+ decryptor,

+ base::Bind(&PipelineIntegrationTestBase::DecryptorAttached,

+ base::Unretained(this)));

+ EXPECT_CALL(*this, DecryptorAttached(Eq(true)));

}

void PipelineIntegrationTestBase::OnVideoRendererPaint(