Index: media/test/pipeline_integration_test_base.cc |
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc |
index a2e4254dc91eabe7442606167800fb1b12908ad0..380b056557d48e69316f1ee93a5fbf5582f56e02 100644 |
--- a/media/test/pipeline_integration_test_base.cc |
+++ b/media/test/pipeline_integration_test_base.cc |
@@ -41,7 +41,7 @@ const char kNullAudioHash[] = "0.00,0.00,0.00,0.00,0.00,0.00,"; |
PipelineIntegrationTestBase::PipelineIntegrationTestBase() |
: hashing_enabled_(false), |
clockless_playback_(false), |
- pipeline_(new Pipeline(message_loop_.task_runner(), new MediaLog())), |
+ pipeline_(new PipelineImpl(message_loop_.task_runner(), new MediaLog())), |
ended_(false), |
pipeline_status_(PIPELINE_OK), |
last_video_frame_format_(PIXEL_FORMAT_UNKNOWN), |
@@ -131,8 +131,9 @@ PipelineStatus PipelineIntegrationTestBase::Start(const std::string& filename, |
// media files are provided in advance. |
EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0); |
+ scoped_ptr<Renderer> renderer = CreateRenderer(); |
pipeline_->Start( |
- demuxer_.get(), CreateRenderer(), |
+ demuxer_.get(), &renderer, |
base::Bind(&PipelineIntegrationTestBase::OnEnded, base::Unretained(this)), |
base::Bind(&PipelineIntegrationTestBase::OnError, base::Unretained(this)), |
base::Bind(&PipelineIntegrationTestBase::OnStatusCallback, |
@@ -187,7 +188,8 @@ bool PipelineIntegrationTestBase::Resume(base::TimeDelta seek_time) { |
EXPECT_CALL(*this, OnBufferingStateChanged(BUFFERING_HAVE_ENOUGH)) |
.WillOnce(InvokeWithoutArgs(&message_loop_, &base::MessageLoop::QuitNow)); |
- pipeline_->Resume(CreateRenderer(), seek_time, |
+ scoped_ptr<Renderer> renderer = CreateRenderer(); |
+ pipeline_->Resume(&renderer, seek_time, |
base::Bind(&PipelineIntegrationTestBase::OnSeeked, |
base::Unretained(this), seek_time)); |
message_loop_.Run(); |