webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc - Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/

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/rtp_rtcp/source/rtcp_format_remb_unittest.cc

Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: 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 | « webrtc/modules/rtp_rtcp/source/receive_statistics_unittest.cc ('k') | webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc

diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc

index bbfb52c6cc9b78b6e65d98d509a8d79fec666537..183076ff59141e2cc9a3f3634588da42563dedd9 100644

--- a/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc

+++ b/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc

@@ -7,8 +7,6 @@

* in the file PATENTS. All contributing project authors may

* be found in the AUTHORS file in the root of the source tree.

-#include <memory>

#include "testing/gtest/include/gtest/gtest.h"

@@ -76,13 +74,13 @@

OverUseDetectorOptions over_use_detector_options_;

Clock* system_clock_;

ModuleRtpRtcpImpl* dummy_rtp_rtcp_impl_;

- std::unique_ptr<ReceiveStatistics> receive_statistics_;

+ rtc::scoped_ptr<ReceiveStatistics> receive_statistics_;

RTCPSender* rtcp_sender_;

RTCPReceiver* rtcp_receiver_;

TestTransport* test_transport_;

test::NullTransport null_transport_;

MockRemoteBitrateObserver remote_bitrate_observer_;

- std::unique_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;

+ rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;

};

void RtcpFormatRembTest::SetUp() {