From 10daf861b91149ea455d201214b677993f83d94f Mon Sep 17 00:00:00 2001
From: nisse <nisse@webrtc.org>
Date: Thu, 8 Dec 2016 06:24:28 -0800
Subject: [PATCH] Simplify an always true condition.

Also deletes one call to CongestionController::pacer.

BUG=None

Review-Url: https://codereview.webrtc.org/2542113003
Cr-Commit-Position: refs/heads/master@{#15479}
---
 .../congestion_controller/include/congestion_controller.h       | 2 ++
 webrtc/video/video_send_stream.cc                               | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/webrtc/modules/congestion_controller/include/congestion_controller.h b/webrtc/modules/congestion_controller/include/congestion_controller.h
index f2bec76f25..d01fdf1d14 100644
--- a/webrtc/modules/congestion_controller/include/congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h
@@ -93,6 +93,8 @@ class CongestionController : public CallStatsObserver, public Module {
   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/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index 188854aede..9a3b51e278 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -1094,7 +1094,7 @@ void VideoSendStreamImpl::ConfigureProtection() {
   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_) {