Move PacedSender ownership to RtpTransportControllerSend.

webrtc/modules/congestion_controller/include/congestion_controller.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 35 matching lines @@
 class CongestionController : public CallStatsObserver,
                              public Module,
                              public TransportFeedbackObserver {
  public:
   using Observer = SendSideCongestionController::Observer;
 
   CongestionController(const Clock* clock,
                        Observer* observer,
                        RemoteBitrateObserver* /* remote_bitrate_observer */,
                        RtcEventLog* event_log,
-                       PacketRouter* packet_router)
-      : send_side_cc_(clock, observer, event_log, packet_router),
-        receive_side_cc_(clock, packet_router) {}
-  CongestionController(const Clock* clock,
-                       Observer* observer,
-                       RemoteBitrateObserver* /* remote_bitrate_observer */,
-                       RtcEventLog* event_log,
                        PacketRouter* packet_router,
-                       std::unique_ptr<PacedSender> pacer)
-      : send_side_cc_(clock, observer, event_log, std::move(pacer)),
+                       PacedSender* pacer)
+      : send_side_cc_(clock, observer, event_log, pacer),
         receive_side_cc_(clock, packet_router) {}
 
   virtual ~CongestionController() {}
 
   virtual void OnReceivedPacket(int64_t arrival_time_ms,
                                 size_t payload_size,
                                 const RTPHeader& header);
 
   virtual void SetBweBitrates(int min_bitrate_bps,
                               int start_bitrate_bps,
                               int max_bitrate_bps);
   // Resets both the BWE state and the bitrate estimator. Note the first
   // argument is the bitrate_bps.
   virtual void OnNetworkRouteChanged(const rtc::NetworkRoute& network_route,
                                      int bitrate_bps,
                                      int min_bitrate_bps,
                                      int max_bitrate_bps);
   virtual void SignalNetworkState(NetworkState state);
   virtual void SetTransportOverhead(size_t transport_overhead_bytes_per_packet);
 
   virtual BitrateController* GetBitrateController() const;
   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. Currently needed by Call,
-  // to register the pacer module on the right thread.
-  virtual PacedSender* pacer() { return send_side_cc_.pacer(); }
   // TODO(nisse): Delete this method, as soon as downstream projects
   // are updated.
   virtual TransportFeedbackObserver* GetTransportFeedbackObserver() {
     return this;
   }
   RateLimiter* GetRetransmissionRateLimiter();
   void EnablePeriodicAlrProbing(bool enable);
 
   // SetAllocatedSendBitrateLimits sets bitrates limits imposed by send codec
   // settings.
@@ skipping 28 matching lines @@
  private:
   SendSideCongestionController send_side_cc_;
   ReceiveSideCongestionController receive_side_cc_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_