diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-01 11:08:40 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-01 12:16:21 +0000 |
commit | 03c549e0392f92c02536d3f86d5e1d8dfa3435ac (patch) | |
tree | fe49d170a929b34ba82cd10db1a0bd8e3760fa4b /chromium/media/renderers/video_renderer_impl_unittest.cc | |
parent | 5d013f5804a0d91fcf6c626b2d6fb6eca5c845b0 (diff) | |
download | qtwebengine-chromium-03c549e0392f92c02536d3f86d5e1d8dfa3435ac.tar.gz |
BASELINE: Update Chromium to 91.0.4472.160
Change-Id: I0def1f08a2412aeed79a9ab95dd50eb5c3f65f31
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/renderers/video_renderer_impl_unittest.cc')
-rw-r--r-- | chromium/media/renderers/video_renderer_impl_unittest.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/chromium/media/renderers/video_renderer_impl_unittest.cc b/chromium/media/renderers/video_renderer_impl_unittest.cc index fd0c208d587..7fd1b5f80a5 100644 --- a/chromium/media/renderers/video_renderer_impl_unittest.cc +++ b/chromium/media/renderers/video_renderer_impl_unittest.cc @@ -86,17 +86,17 @@ class VideoRendererImplTest : public testing::Test { demuxer_stream_(DemuxerStream::VIDEO), simulate_decode_delay_(false), expect_init_success_(true) { - null_video_sink_.reset( - new NullVideoSink(false, base::TimeDelta::FromSecondsD(1.0 / 60), - base::BindRepeating(&MockCB::FrameReceived, - base::Unretained(&mock_cb_)), - base::ThreadTaskRunnerHandle::Get())); + null_video_sink_ = std::make_unique<NullVideoSink>( + false, base::TimeDelta::FromSecondsD(1.0 / 60), + base::BindRepeating(&MockCB::FrameReceived, + base::Unretained(&mock_cb_)), + base::ThreadTaskRunnerHandle::Get()); - renderer_.reset(new VideoRendererImpl( + renderer_ = std::make_unique<VideoRendererImpl>( base::ThreadTaskRunnerHandle::Get(), null_video_sink_.get(), base::BindRepeating(&VideoRendererImplTest::CreateVideoDecodersForTest, base::Unretained(this)), - true, &media_log_, nullptr)); + true, &media_log_, nullptr); renderer_->SetTickClockForTesting(&tick_clock_); null_video_sink_->set_tick_clock_for_testing(&tick_clock_); time_source_.SetTickClockForTesting(&tick_clock_); @@ -1177,14 +1177,13 @@ TEST_F(VideoRendererImplTest, VideoFrameRateChange) { class VideoRendererImplAsyncAddFrameReadyTest : public VideoRendererImplTest { public: void InitializeWithMockGpuMemoryBufferVideoFramePool() { - renderer_.reset(new VideoRendererImpl( + renderer_ = std::make_unique<VideoRendererImpl>( base::ThreadTaskRunnerHandle::Get(), null_video_sink_.get(), base::BindRepeating(&VideoRendererImplAsyncAddFrameReadyTest:: CreateVideoDecodersForTest, base::Unretained(this)), true, &media_log_, - std::make_unique<MockGpuMemoryBufferVideoFramePool>( - &frame_ready_cbs_))); + std::make_unique<MockGpuMemoryBufferVideoFramePool>(&frame_ready_cbs_)); VideoRendererImplTest::Initialize(); } |