Simplify an always true condition.
Also deletes one call to CongestionController::pacer.
BUG=None
Review-Url: https://codereview.webrtc.org/2542113003
Cr-Original-Commit-Position: refs/heads/master@{#15479}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 10daf861b91149ea455d201214b677993f83d94f
diff --git a/modules/congestion_controller/include/congestion_controller.h b/modules/congestion_controller/include/congestion_controller.h
index f2bec76..d01fdf1 100644
--- a/modules/congestion_controller/include/congestion_controller.h
+++ b/modules/congestion_controller/include/congestion_controller.h
@@ -93,6 +93,8 @@
virtual RemoteBitrateEstimator* GetRemoteBitrateEstimator(
bool send_side_bwe);
virtual int64_t GetPacerQueuingDelayMs() const;
+ // 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_; }
diff --git a/video/video_send_stream.cc b/video/video_send_stream.cc
index 188854a..9a3b51e 100644
--- a/video/video_send_stream.cc
+++ b/video/video_send_stream.cc
@@ -1094,7 +1094,7 @@
for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
// Set NACK.
rtp_rtcp->SetStorePacketsStatus(
- nack_enabled || congestion_controller_->pacer(),
+ true,
kMinSendSidePacketHistorySize);
// Set RED/ULPFEC information.
for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
