webrtc/modules/congestion_controller/congestion_controller.cc - Issue 1785173002: Replace 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/congestion_controller/congestion_controller.cc

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

Patch Set: Created 4 years, 9 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/bitrate_controller/bitrate_controller_impl.h ('k') | webrtc/modules/pacing/paced_sender.h » ('j') | webrtc/modules/utility/source/coder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/congestion_controller/congestion_controller.cc

diff --git a/webrtc/modules/congestion_controller/congestion_controller.cc b/webrtc/modules/congestion_controller/congestion_controller.cc

index aafab663b7b33420f1bc908cd36428bb433175ad..11ce46adf3a6063ec268d65b04a2bc2db5130b8c 100644

--- a/webrtc/modules/congestion_controller/congestion_controller.cc

+++ b/webrtc/modules/congestion_controller/congestion_controller.cc

@@ -11,6 +11,7 @@

#include "webrtc/modules/congestion_controller/include/congestion_controller.h"

#include <algorithm>

+#include <memory>

#include <vector>

#include "webrtc/base/checks.h"

@@ -123,8 +124,8 @@ class WrappingBitrateEstimator : public RemoteBitrateEstimator {

RemoteBitrateObserver* observer_;

Clock* const clock_;

- rtc::scoped_ptr<CriticalSectionWrapper> crit_sect_;

- rtc::scoped_ptr<RemoteBitrateEstimator> rbe_;

+ std::unique_ptr<CriticalSectionWrapper> crit_sect_;

+ std::unique_ptr<RemoteBitrateEstimator> rbe_;

bool using_absolute_send_time_;

uint32_t packets_since_absolute_send_time_;

int min_bitrate_bps_;