| Index: media/base/pipeline_unittest.cc
|
| diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
|
| index 8f43d608889805db4a7eac842ef7d6db84ab1733..1feaa7707d96cb1d21f99136e4113fbca268f9d9 100644
|
| --- a/media/base/pipeline_unittest.cc
|
| +++ b/media/base/pipeline_unittest.cc
|
| @@ -97,8 +97,8 @@ class PipelineTest : public ::testing::Test {
|
| };
|
|
|
| PipelineTest()
|
| - : pipeline_(new Pipeline(message_loop_.task_runner(),
|
| - new MediaLog())),
|
| + : pipeline_(
|
| + new PipelineImpl(message_loop_.task_runner(), new MediaLog())),
|
| demuxer_(new StrictMock<MockDemuxer>()),
|
| scoped_renderer_(new StrictMock<MockRenderer>()),
|
| renderer_(scoped_renderer_.get()) {
|
| @@ -193,8 +193,9 @@ class PipelineTest : public ::testing::Test {
|
|
|
| void StartPipeline() {
|
| EXPECT_CALL(*this, OnWaitingForDecryptionKey()).Times(0);
|
| + scoped_ptr<Renderer> renderer = std::move(scoped_renderer_);
|
| pipeline_->Start(
|
| - demuxer_.get(), std::move(scoped_renderer_),
|
| + demuxer_.get(), &renderer,
|
| base::Bind(&CallbackHelper::OnEnded, base::Unretained(&callbacks_)),
|
| base::Bind(&CallbackHelper::OnError, base::Unretained(&callbacks_)),
|
| base::Bind(&CallbackHelper::OnStart, base::Unretained(&callbacks_)),
|
| @@ -315,8 +316,9 @@ class PipelineTest : public ::testing::Test {
|
| }
|
|
|
| void DoResume(const base::TimeDelta& seek_time) {
|
| + scoped_ptr<Renderer> renderer = std::move(scoped_renderer_);
|
| pipeline_->Resume(
|
| - std::move(scoped_renderer_), seek_time,
|
| + &renderer, seek_time,
|
| base::Bind(&CallbackHelper::OnResume, base::Unretained(&callbacks_)));
|
| message_loop_.RunUntilIdle();
|
| }
|
| @@ -354,7 +356,7 @@ class PipelineTest : public ::testing::Test {
|
| StrictMock<CallbackHelper> callbacks_;
|
| base::SimpleTestTickClock test_tick_clock_;
|
| base::MessageLoop message_loop_;
|
| - scoped_ptr<Pipeline> pipeline_;
|
| + scoped_ptr<PipelineImpl> pipeline_;
|
|
|
| scoped_ptr<StrictMock<MockDemuxer> > demuxer_;
|
| scoped_ptr<StrictMock<MockRenderer> > scoped_renderer_;
|
| @@ -734,9 +736,9 @@ TEST_F(PipelineTest, ErrorDuringSeek) {
|
|
|
| // Invoked function OnError. This asserts that the pipeline does not enqueue
|
| // non-teardown related tasks while tearing down.
|
| -static void TestNoCallsAfterError(
|
| - Pipeline* pipeline, base::MessageLoop* message_loop,
|
| - PipelineStatus /* status */) {
|
| +static void TestNoCallsAfterError(PipelineImpl* pipeline,
|
| + base::MessageLoop* message_loop,
|
| + PipelineStatus /* status */) {
|
| CHECK(pipeline);
|
| CHECK(message_loop);
|
|
|
|
|