diff options
| author | xhwang <xhwang@chromium.org> | 2014-09-02 19:00:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-03 02:07:49 +0000 |
| commit | 3dd339ddb7068045d29b0ce7edf539dd96e4fd85 (patch) | |
| tree | a67f10d167b0d43ca7c08a83174502e6fd2eaf32 /media/base/pipeline_unittest.cc | |
| parent | b8cfd3dc77254e5df31ba8e23ccb517008f98732 (diff) | |
| download | chromium_src-3dd339ddb7068045d29b0ce7edf539dd96e4fd85.zip chromium_src-3dd339ddb7068045d29b0ce7edf539dd96e4fd85.tar.gz chromium_src-3dd339ddb7068045d29b0ce7edf539dd96e4fd85.tar.bz2 | |
Replace init_cb in Renderer::Initialize() with base::Closure.
BUG=392236
TEST=Existing tests pass.
Review URL: https://codereview.chromium.org/526653002
Cr-Commit-Position: refs/heads/master@{#293048}
Diffstat (limited to 'media/base/pipeline_unittest.cc')
| -rw-r--r-- | media/base/pipeline_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc index cca82eb..af5f949 100644 --- a/media/base/pipeline_unittest.cc +++ b/media/base/pipeline_unittest.cc @@ -166,7 +166,7 @@ class PipelineTest : public ::testing::Test { EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _)) .WillOnce(DoAll(SaveArg<2>(&ended_cb_), SaveArg<4>(&buffering_state_cb_), - RunCallback<0>(PIPELINE_OK))); + RunCallback<0>())); EXPECT_CALL(*renderer_, HasAudio()).WillRepeatedly(Return(audio_stream())); EXPECT_CALL(*renderer_, HasVideo()).WillRepeatedly(Return(video_stream())); } @@ -830,12 +830,12 @@ class PipelineTeardownTest : public PipelineTest { if (stop_or_error == kStop) { EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _)) .WillOnce(DoAll(Stop(pipeline_.get(), stop_cb), - RunCallback<0>(PIPELINE_OK))); + RunCallback<0>())); ExpectPipelineStopAndDestroyPipeline(); } else { status = PIPELINE_ERROR_INITIALIZATION_FAILED; EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _)) - .WillOnce(RunCallback<0>(status)); + .WillOnce(DoAll(RunCallback<3>(status), RunCallback<0>())); } EXPECT_CALL(*demuxer_, Stop()); @@ -844,7 +844,7 @@ class PipelineTeardownTest : public PipelineTest { EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _)) .WillOnce(DoAll(SaveArg<4>(&buffering_state_cb_), - RunCallback<0>(PIPELINE_OK))); + RunCallback<0>())); EXPECT_CALL(callbacks_, OnMetadata(_)); |