Chromium Code Reviews| Index: media/base/pipeline_unittest.cc |
| diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc |
| index 8f43d608889805db4a7eac842ef7d6db84ab1733..65c639432c72aa066c73a1f5a56d81469f965ea0 100644 |
| --- a/media/base/pipeline_unittest.cc |
| +++ b/media/base/pipeline_unittest.cc |
| @@ -97,8 +97,8 @@ class PipelineTest : public ::testing::Test { |
| }; |
| PipelineTest() |
|
xhwang
2016/02/19 17:06:07
Should this be PipelineImplTest?
sandersd (OOO until July 31)
2016/02/22 22:32:57
Done.
|
| - : 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()) { |
| @@ -354,7 +354,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 +734,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); |