| Index: media/base/pipeline_unittest.cc
|
| diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
|
| index 1506c2194f7c29fe704cda9105a26f7b511d3fb6..5dd1c8021911841c9a45223f107f578a95fc39c9 100644
|
| --- a/media/base/pipeline_unittest.cc
|
| +++ b/media/base/pipeline_unittest.cc
|
| @@ -122,7 +122,7 @@ class PipelineTest : public ::testing::Test {
|
| void InitializeDemuxer(MockDemuxerStreamVector* streams,
|
| const base::TimeDelta& duration) {
|
| EXPECT_CALL(callbacks_, OnDurationChange());
|
| - EXPECT_CALL(*demuxer_, Initialize(_, _))
|
| + EXPECT_CALL(*demuxer_, Initialize(_, _, _))
|
| .WillOnce(DoAll(SetDemuxerProperties(duration),
|
| RunCallback<1>(PIPELINE_OK)));
|
|
|
| @@ -338,7 +338,7 @@ TEST_F(PipelineTest, NotStarted) {
|
|
|
| TEST_F(PipelineTest, NeverInitializes) {
|
| // Don't execute the callback passed into Initialize().
|
| - EXPECT_CALL(*demuxer_, Initialize(_, _));
|
| + EXPECT_CALL(*demuxer_, Initialize(_, _, _));
|
|
|
| // This test hangs during initialization by never calling
|
| // InitializationComplete(). StrictMock<> will ensure that the callback is
|
| @@ -363,7 +363,7 @@ TEST_F(PipelineTest, NeverInitializes) {
|
| }
|
|
|
| TEST_F(PipelineTest, URLNotFound) {
|
| - EXPECT_CALL(*demuxer_, Initialize(_, _))
|
| + EXPECT_CALL(*demuxer_, Initialize(_, _, _))
|
| .WillOnce(RunCallback<1>(PIPELINE_ERROR_URL_NOT_FOUND));
|
| EXPECT_CALL(*demuxer_, Stop(_))
|
| .WillOnce(RunClosure<0>());
|
| @@ -372,7 +372,7 @@ TEST_F(PipelineTest, URLNotFound) {
|
| }
|
|
|
| TEST_F(PipelineTest, NoStreams) {
|
| - EXPECT_CALL(*demuxer_, Initialize(_, _))
|
| + EXPECT_CALL(*demuxer_, Initialize(_, _, _))
|
| .WillOnce(RunCallback<1>(PIPELINE_OK));
|
| EXPECT_CALL(*demuxer_, Stop(_))
|
| .WillOnce(RunClosure<0>());
|
| @@ -923,13 +923,13 @@ class PipelineTeardownTest : public PipelineTest {
|
|
|
| if (state == kInitDemuxer) {
|
| if (stop_or_error == kStop) {
|
| - EXPECT_CALL(*demuxer_, Initialize(_, _))
|
| + EXPECT_CALL(*demuxer_, Initialize(_, _, _))
|
| .WillOnce(DoAll(Stop(pipeline_.get(), stop_cb),
|
| RunCallback<1>(PIPELINE_OK)));
|
| EXPECT_CALL(callbacks_, OnStop());
|
| } else {
|
| status = DEMUXER_ERROR_COULD_NOT_OPEN;
|
| - EXPECT_CALL(*demuxer_, Initialize(_, _))
|
| + EXPECT_CALL(*demuxer_, Initialize(_, _, _))
|
| .WillOnce(RunCallback<1>(status));
|
| }
|
|
|
|
|