webrtc/modules/congestion_controller/include/congestion_controller.h - 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/congestion_controller/include/congestion_controller.h

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/audio_processing/test/debug_dump_test.cc ('k') | webrtc/modules/desktop_capture/cropping_window_capturer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/congestion_controller/include/congestion_controller.h

diff --git a/webrtc/modules/congestion_controller/include/congestion_controller.h b/webrtc/modules/congestion_controller/include/congestion_controller.h

index 96ff4b34d87580fe929519bcdc026f26a0329688..13614f59769e9f80a9f8923f12d0c7b07da12e2c 100644

--- a/webrtc/modules/congestion_controller/include/congestion_controller.h

+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h

@@ -11,9 +11,8 @@

#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_

#define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_

-#include <memory>

#include "webrtc/base/constructormagic.h"

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

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

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

#include "webrtc/modules/pacing/packet_router.h"

@@ -70,9 +69,9 @@

private:

Clock* const clock_;

- const std::unique_ptr<PacedSender> pacer_;

- const std::unique_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;

- const std::unique_ptr<BitrateController> bitrate_controller_;

+ const rtc::scoped_ptr<PacedSender> pacer_;

+ const rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;

+ const rtc::scoped_ptr<BitrateController> bitrate_controller_;

PacketRouter packet_router_;

RemoteEstimatorProxy remote_estimator_proxy_;

TransportFeedbackAdapter transport_feedback_adapter_;