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

Unified Diff: media/renderers/video_renderer_impl_unittest.cc

Issue 1915443003: Replace scoped_ptr with std::unique_ptr in //media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptr-media-base
Patch Set: scopedptr-media: rebase Created 4 years, 8 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/renderers/video_renderer_impl.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/video_renderer_impl_unittest.cc
diff --git a/media/renderers/video_renderer_impl_unittest.cc b/media/renderers/video_renderer_impl_unittest.cc
index 7f90a6388e2ffb6f1dbc402c3df4c5a7e6202243..41c751f9c158e33e5c94093f85332cbcc6d2fd1c 100644
--- a/media/renderers/video_renderer_impl_unittest.cc
+++ b/media/renderers/video_renderer_impl_unittest.cc
@@ -4,6 +4,7 @@
#include <stdint.h>
+#include <memory>
#include <utility>
#include "base/bind.h"
@@ -70,7 +71,8 @@ class VideoRendererImplTest
null_video_sink_.get(), std::move(decoders), true,
nullptr, // gpu_factories
new MediaLog()));
- renderer_->SetTickClockForTesting(scoped_ptr<base::TickClock>(tick_clock_));
+ renderer_->SetTickClockForTesting(
+ std::unique_ptr<base::TickClock>(tick_clock_));
null_video_sink_->set_tick_clock_for_testing(tick_clock_);
time_source_.set_tick_clock_for_testing(tick_clock_);
@@ -410,7 +412,7 @@ class VideoRendererImplTest
protected:
// Fixture members.
- scoped_ptr<VideoRendererImpl> renderer_;
+ std::unique_ptr<VideoRendererImpl> renderer_;
base::SimpleTestTickClock* tick_clock_; // Owned by |renderer_|.
NiceMock<MockVideoDecoder>* decoder_; // Owned by |renderer_|.
NiceMock<MockDemuxerStream> demuxer_stream_;
@@ -424,7 +426,7 @@ class VideoRendererImplTest
StrictMock<MockCB> mock_cb_;
// Must be destroyed before |renderer_| since they share |tick_clock_|.
- scoped_ptr<NullVideoSink> null_video_sink_;
+ std::unique_ptr<NullVideoSink> null_video_sink_;
PipelineStatistics last_pipeline_statistics_;
@@ -861,7 +863,7 @@ TEST_F(VideoRendererImplTest, FramesAreNotExpiredDuringPreroll) {
class VideoRendererImplAsyncAddFrameReadyTest : public VideoRendererImplTest {
public:
VideoRendererImplAsyncAddFrameReadyTest() {
- scoped_ptr<GpuMemoryBufferVideoFramePool> gpu_memory_buffer_pool(
+ std::unique_ptr<GpuMemoryBufferVideoFramePool> gpu_memory_buffer_pool(
new MockGpuMemoryBufferVideoFramePool(&frame_ready_cbs_));
renderer_->SetGpuMemoryBufferVideoForTesting(
std::move(gpu_memory_buffer_pool));
« no previous file with comments | « media/renderers/video_renderer_impl.cc ('k') | media/test/pipeline_integration_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698