zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/

Browse Source 
BUG=webrtc:5520

Review URL: https://codereview.webrtc.org/1921233002

Cr-Commit-Position: refs/heads/master@{#12511}
This commit is contained in:
kwiberg
2016-04-26 08:37:53 -07:00
committed by Commit bot
parent 1c7fdd86eb
commit 2c27a062ee
61 changed files with 195 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/congestion_controller/include/congestion_controller.h
View File

@ -11,8 +11,9 @@
#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"
@ -69,9 +70,9 @@ class CongestionController : public CallStatsObserver, public Module {
private:
Clock* const clock_;
const rtc::scoped_ptr<PacedSender> pacer_;
const rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
const rtc::scoped_ptr<BitrateController> bitrate_controller_;
const std::unique_ptr<PacedSender> pacer_;
const std::unique_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
const std::unique_ptr<BitrateController> bitrate_controller_;
PacketRouter packet_router_;
RemoteEstimatorProxy remote_estimator_proxy_;
TransportFeedbackAdapter transport_feedback_adapter_;