webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h - Issue 1721353002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_coding/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h

Issue 1721353002: Replace scoped_ptr with unique_ptr in webrtc/modules/video_coding/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 4 years, 10 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 | « webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter_unittest.cc ('k') | webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h

diff --git a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h

index 4e1e68616951596eb9de13a678808319303135d2..9f0dc5ce93a5f339f023d2a538f2e96bd17a7b07 100644

--- a/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h

+++ b/webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h

@@ -12,10 +12,10 @@

#define WEBRTC_MODULES_VIDEO_CODING_CODECS_VP8_SIMULCAST_UNITTEST_H_

#include <algorithm>

+#include <memory>

#include <vector>

#include "webrtc/base/checks.h"

-#include "webrtc/base/scoped_ptr.h"

#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"

#include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"

#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"

@@ -944,9 +944,9 @@ class TestVp8Simulcast : public ::testing::Test {

}

- rtc::scoped_ptr<VP8Encoder> encoder_;

+ std::unique_ptr<VP8Encoder> encoder_;

MockEncodedImageCallback encoder_callback_;

- rtc::scoped_ptr<VP8Decoder> decoder_;

+ std::unique_ptr<VP8Decoder> decoder_;

MockDecodedImageCallback decoder_callback_;

VideoCodec settings_;

VideoFrame input_frame_;