Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1175)

Unified Diff: media/base/pipeline_unittest.cc

Issue 534073002: Switch to using media::TimeSource inside media::RendererImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix bad rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/pipeline.cc ('k') | media/base/renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/pipeline_unittest.cc
diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index af5f9497c28a3684d2efec448b6225f48901a737..8a4dea1582362fe3d7428a429715deae4034a41d 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -163,7 +163,7 @@ class PipelineTest : public ::testing::Test {
// Sets up expectations to allow the video renderer to initialize.
void SetRendererExpectations() {
- EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
+ EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _))
.WillOnce(DoAll(SaveArg<2>(&ended_cb_),
SaveArg<4>(&buffering_state_cb_),
RunCallback<0>()));
@@ -828,13 +828,13 @@ class PipelineTeardownTest : public PipelineTest {
if (state == kInitRenderer) {
if (stop_or_error == kStop) {
- EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
+ EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _))
.WillOnce(DoAll(Stop(pipeline_.get(), stop_cb),
RunCallback<0>()));
ExpectPipelineStopAndDestroyPipeline();
} else {
status = PIPELINE_ERROR_INITIALIZATION_FAILED;
- EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
+ EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _))
.WillOnce(DoAll(RunCallback<3>(status), RunCallback<0>()));
}
@@ -842,7 +842,7 @@ class PipelineTeardownTest : public PipelineTest {
return status;
}
- EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _, _))
+ EXPECT_CALL(*renderer_, Initialize(_, _, _, _, _))
.WillOnce(DoAll(SaveArg<4>(&buffering_state_cb_),
RunCallback<0>()));
« no previous file with comments | « media/base/pipeline.cc ('k') | media/base/renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698