Move PacedSender ownership to RtpTransportControllerSend.

webrtc/modules/congestion_controller/include/send_side_congestion_controller.h

Index: webrtc/modules/congestion_controller/include/send_side_congestion_controller.h
diff --git a/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h b/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h
index 1d576aaf00987a181aedda61363125aecd022242..490711f54db3ed668b82cb967037eae63ae9e2c4 100644
--- a/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/send_side_congestion_controller.h
@@ -58,16 +58,17 @@ class SendSideCongestionController : public CallStatsObserver,
    protected:
     virtual ~Observer() {}
   };
+  // TODO(holmer): Delete after fixing upstream projects.
+  RTC_DEPRECATED SendSideCongestionController(const Clock* clock,
+                                              Observer* observer,
+                                              RtcEventLog* event_log,
+                                              PacketRouter* packet_router);
   // TODO(nisse): Consider deleting the |observer| argument to constructors
   // once CongestionController is deleted.
   SendSideCongestionController(const Clock* clock,
                                Observer* observer,
                                RtcEventLog* event_log,
-                               PacketRouter* packet_router);
-  SendSideCongestionController(const Clock* clock,
-                               Observer* observer,
-                               RtcEventLog* event_log,
-                               std::unique_ptr<PacedSender> pacer);
+                               PacedSender* pacer);
   ~SendSideCongestionController() override;
 
   void RegisterPacketFeedbackObserver(PacketFeedbackObserver* observer);
@@ -91,26 +92,12 @@ class SendSideCongestionController : public CallStatsObserver,
   virtual BitrateController* GetBitrateController() const;
   virtual int64_t GetPacerQueuingDelayMs() const;
   virtual int64_t GetFirstPacketTimeMs() const;
-  // TODO(nisse): Delete this accessor function. The pacer should be
-  // internal to the congestion controller.
-  virtual PacedSender* pacer();
+
   virtual TransportFeedbackObserver* GetTransportFeedbackObserver();
 
   RateLimiter* GetRetransmissionRateLimiter();
   void EnablePeriodicAlrProbing(bool enable);
 
-  // SetAllocatedSendBitrateLimits sets bitrates limits imposed by send codec
-  // settings.
-  // |min_send_bitrate_bps| is the total minimum send bitrate required by all
-  // sending streams.  This is the minimum bitrate the PacedSender will use.
-  // Note that SendSideCongestionController::OnNetworkChanged can still be
-  // called with a lower bitrate estimate. |max_padding_bitrate_bps| is the max
-  // bitrate the send streams request for padding. This can be higher than the
-  // current network estimate and tells the PacedSender how much it should max
-  // pad unless there is real packets to send.
-  void SetAllocatedSendBitrateLimits(int min_send_bitrate_bps,
-                                     int max_padding_bitrate_bps);
-
   virtual void OnSentPacket(const rtc::SentPacket& sent_packet);
 
   // Implements CallStatsObserver.
@@ -141,7 +128,8 @@ class SendSideCongestionController : public CallStatsObserver,
   rtc::CriticalSection observer_lock_;
   Observer* observer_ GUARDED_BY(observer_lock_);
   RtcEventLog* const event_log_;
-  const std::unique_ptr<PacedSender> pacer_;
+  std::unique_ptr<PacedSender> owned_pacer_;
+  PacedSender* pacer_;
   const std::unique_ptr<BitrateController> bitrate_controller_;
   std::unique_ptr<AcknowledgedBitrateEstimator> acknowledged_bitrate_estimator_;
   const std::unique_ptr<ProbeController> probe_controller_;