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

Unified Diff: media/filters/renderer_impl_unittest.cc

Issue 568113003: Switch back to using VideoRenderer::StartPlayingFrom(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix + 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/filters/renderer_impl.cc ('k') | media/filters/video_renderer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/renderer_impl_unittest.cc
diff --git a/media/filters/renderer_impl_unittest.cc b/media/filters/renderer_impl_unittest.cc
index ce2f72cef411fe0f0cf2ba1a199d965b48f0c921..7f74d15496f549fcb6cdebe8baff3956c2218006 100644
--- a/media/filters/renderer_impl_unittest.cc
+++ b/media/filters/renderer_impl_unittest.cc
@@ -172,10 +172,11 @@ class RendererImplTest : public ::testing::Test {
DCHECK(audio_stream_ || video_stream_);
EXPECT_CALL(callbacks_, OnBufferingStateChange(BUFFERING_HAVE_ENOUGH));
+ base::TimeDelta start_time(
+ base::TimeDelta::FromMilliseconds(kStartPlayingTimeInMs));
+
if (audio_stream_) {
- EXPECT_CALL(time_source_,
- SetMediaTime(base::TimeDelta::FromMilliseconds(
- kStartPlayingTimeInMs)));
+ EXPECT_CALL(time_source_, SetMediaTime(start_time));
EXPECT_CALL(time_source_, StartTicking());
EXPECT_CALL(*audio_renderer_, StartPlaying())
.WillOnce(SetBufferingState(&audio_buffering_state_cb_,
@@ -183,13 +184,12 @@ class RendererImplTest : public ::testing::Test {
}
if (video_stream_) {
- EXPECT_CALL(*video_renderer_, StartPlaying())
+ EXPECT_CALL(*video_renderer_, StartPlayingFrom(start_time))
.WillOnce(SetBufferingState(&video_buffering_state_cb_,
BUFFERING_HAVE_ENOUGH));
}
- renderer_impl_->StartPlayingFrom(
- base::TimeDelta::FromMilliseconds(kStartPlayingTimeInMs));
+ renderer_impl_->StartPlayingFrom(start_time);
base::RunLoop().RunUntilIdle();
}
« no previous file with comments | « media/filters/renderer_impl.cc ('k') | media/filters/video_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698