From 7dada5e4c09c073f68ec2f7e73622075ebecaf5a Mon Sep 17 00:00:00 2001 From: nisse Date: Thu, 8 Dec 2016 07:49:00 -0800 Subject: [PATCH] Delete deprecated CongestionController constructor and packet_router method. This is a followup to https://codereview.webrtc.org/2516983004/, to be landed after downstream projects are updated. BUG=webrtc:6847 Review-Url: https://codereview.webrtc.org/2548633003 Cr-Commit-Position: refs/heads/master@{#15484} --- .../congestion_controller/congestion_controller.cc | 11 ----------- .../include/congestion_controller.h | 10 ---------- 2 files changed, 21 deletions(-) diff --git a/webrtc/modules/congestion_controller/congestion_controller.cc b/webrtc/modules/congestion_controller/congestion_controller.cc index c31d441c97..44b2f41e86 100644 --- a/webrtc/modules/congestion_controller/congestion_controller.cc +++ b/webrtc/modules/congestion_controller/congestion_controller.cc @@ -163,17 +163,6 @@ CongestionController::CongestionController( std::unique_ptr(new PacedSender(clock, packet_router))) { } -CongestionController::CongestionController( - Clock* clock, - Observer* observer, - RemoteBitrateObserver* remote_bitrate_observer, - RtcEventLog* event_log) - : CongestionController(clock, observer, remote_bitrate_observer, event_log, - new PacketRouter()) { - // Record ownership. - owned_packet_router_.reset(packet_router_); -} - CongestionController::CongestionController( Clock* clock, Observer* observer, diff --git a/webrtc/modules/congestion_controller/include/congestion_controller.h b/webrtc/modules/congestion_controller/include/congestion_controller.h index d01fdf1d14..e1151c1544 100644 --- a/webrtc/modules/congestion_controller/include/congestion_controller.h +++ b/webrtc/modules/congestion_controller/include/congestion_controller.h @@ -67,11 +67,6 @@ class CongestionController : public CallStatsObserver, public Module { RemoteBitrateObserver* remote_bitrate_observer, RtcEventLog* event_log, PacketRouter* packet_router); - // TODO(nisse): Deprecated. Will create and own a PacketRouter. - CongestionController(Clock* clock, - Observer* observer, - RemoteBitrateObserver* remote_bitrate_observer, - RtcEventLog* event_log); CongestionController(Clock* clock, Observer* observer, RemoteBitrateObserver* remote_bitrate_observer, @@ -96,8 +91,6 @@ class CongestionController : public CallStatsObserver, public Module { // TODO(nisse): Delete this accessor function. The pacer should be // internal to the congestion controller. virtual PacedSender* pacer() { return pacer_.get(); } - // TODO(nisse): Deprecated, but still used by downstream projects. - virtual PacketRouter* packet_router() { return packet_router_; } virtual TransportFeedbackObserver* GetTransportFeedbackObserver(); RateLimiter* GetRetransmissionRateLimiter(); void EnablePeriodicAlrProbing(bool enable); @@ -134,9 +127,6 @@ class CongestionController : public CallStatsObserver, public Module { int64_t rtt); Clock* const clock_; Observer* const observer_; - // Used by the deprecated constructor, where caller doesn't provide - // the packet_router. - std::unique_ptr owned_packet_router_; PacketRouter* const packet_router_; const std::unique_ptr pacer_; const std::unique_ptr remote_bitrate_estimator_;