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 13614f59769e9f80a9f8923f12d0c7b07da12e2c..96ff4b34d87580fe929519bcdc026f26a0329688 100644 |
--- a/webrtc/modules/congestion_controller/include/congestion_controller.h |
+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h |
@@ -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_; |