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

Unified Diff: media/test/pipeline_integration_test.cc

Issue 1658303002: Create abstract interface for media::Pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Separate PipelineImpl. 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
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 43da5c1d69ea4d6f97f6e728ca385208fa451605..1f2a2311c1cf9a136de480cf3f7aa6144a33bed0 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -695,8 +695,9 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0);
demuxer_ = source->GetDemuxer();
+ scoped_ptr<Renderer> renderer = CreateRenderer();
pipeline_->Start(
- demuxer_.get(), CreateRenderer(),
+ demuxer_.get(), &renderer,
base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnStatusCallback,
@@ -742,13 +743,14 @@ class PipelineIntegrationTest : public PipelineIntegrationTestHost {
EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0);
demuxer_ = source->GetDemuxer();
+ scoped_ptr<Renderer> renderer = CreateRenderer();
pipeline_->SetCdm(encrypted_media->GetCdmContext(),
base::Bind(&PipelineIntegrationTest::DecryptorAttached,
base::Unretained(this)));
pipeline_->Start(
- demuxer_.get(), CreateRenderer(),
+ demuxer_.get(), &renderer,
base::Bind(&PipelineIntegrationTest::OnEnded, base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnError, base::Unretained(this)),
base::Bind(&PipelineIntegrationTest::OnStatusCallback,

Powered by Google App Engine
This is Rietveld 408576698