Move ownership of PacketRouter from CongestionController to Call.

webrtc/modules/congestion_controller/include/congestion_controller.h

Index: webrtc/modules/congestion_controller/include/congestion_controller.h
diff --git a/webrtc/modules/congestion_controller/include/congestion_controller.h b/webrtc/modules/congestion_controller/include/congestion_controller.h
index 4f9ce95e2c5b1bc4702b150ba32542e9fbbc2cfc..ed37b9a4ce67dfcf55d250579c93c98561b571a8 100644
--- a/webrtc/modules/congestion_controller/include/congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h
@@ -56,12 +56,18 @@ class CongestionController : public CallStatsObserver, public Module {
   CongestionController(Clock* clock,
                        Observer* observer,
                        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,
                        RtcEventLog* event_log,
-                       std::unique_ptr<PacketRouter> packet_router,
+                       PacketRouter* packet_router,
                        std::unique_ptr<PacedSender> pacer);
   virtual ~CongestionController();
 
@@ -79,7 +85,8 @@ class CongestionController : public CallStatsObserver, public Module {
       bool send_side_bwe);
   virtual int64_t GetPacerQueuingDelayMs() const;
   virtual PacedSender* pacer() { return pacer_.get(); }
-  virtual PacketRouter* packet_router() { return packet_router_.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);
@@ -107,7 +114,6 @@ class CongestionController : public CallStatsObserver, public Module {
   void Process() override;
 
  private:
-  void Init();
   void MaybeTriggerOnNetworkChanged();
 
   bool IsSendQueueFull() const;
@@ -117,7 +123,10 @@ class CongestionController : public CallStatsObserver, public Module {
                                            int64_t rtt);
   Clock* const clock_;
   Observer* const observer_;
-  const std::unique_ptr<PacketRouter> packet_router_;
+  // Used by the deprecated constructor, where caller doesn't provide
+  // the packet_router.
+  std::unique_ptr<PacketRouter> owned_packet_router_;
+  PacketRouter* const packet_router_;
   const std::unique_ptr<PacedSender> pacer_;
   const std::unique_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
   const std::unique_ptr<BitrateController> bitrate_controller_;