Chromium Code Reviews| Index: media/filters/video_renderer_algorithm_unittest.cc |
| diff --git a/media/filters/video_renderer_algorithm_unittest.cc b/media/filters/video_renderer_algorithm_unittest.cc |
| index 20ce6ef826d93bf91c0a7e6ec01443aa93179e27..f43edfc3d42813b4548fe342f24709d1bf21dca3 100644 |
| --- a/media/filters/video_renderer_algorithm_unittest.cc |
| +++ b/media/filters/video_renderer_algorithm_unittest.cc |
| @@ -69,8 +69,7 @@ class VideoRendererAlgorithmTest : public testing::Test { |
| // Always start the TickClock at a non-zero value since null values have |
| // special connotations. |
| tick_clock_->Advance(base::TimeDelta::FromMicroseconds(10000)); |
| - time_source_.SetTickClockForTesting( |
| - scoped_ptr<base::TickClock>(tick_clock_)); |
| + time_source_.set_tick_clock_for_testing(tick_clock_.get()); |
| } |
| ~VideoRendererAlgorithmTest() override {} |
| @@ -301,8 +300,8 @@ class VideoRendererAlgorithmTest : public testing::Test { |
| protected: |
| VideoFramePool frame_pool_; |
| + scoped_ptr<base::SimpleTestTickClock> tick_clock_; |
| WallClockTimeSource time_source_; |
| - base::SimpleTestTickClock* tick_clock_; // Owned by |time_source_|. |
| VideoRendererAlgorithm algorithm_; |
| private: |
| @@ -606,7 +605,7 @@ TEST_F(VideoRendererAlgorithmTest, TimeIsStopped) { |
| EXPECT_EQ(tg.interval(1), frame->timestamp()); |
| EXPECT_EQ(0u, frames_dropped); |
| EXPECT_EQ(2u, frames_queued()); |
| - EXPECT_EQ(2u, algorithm_.EffectiveFramesQueued()); |
| + EXPECT_EQ(1u, algorithm_.EffectiveFramesQueued()); |
|
DaleCurtis
2015/05/12 01:32:34
Since we return false and keep all previously calc
|
| } |
| // Verify frames inserted out of order end up in the right spot and are rendered |