Move ownership of PacketRouter from CongestionController to Call.

webrtc/audio/audio_receive_stream_unittest.cc

Index: webrtc/audio/audio_receive_stream_unittest.cc
diff --git a/webrtc/audio/audio_receive_stream_unittest.cc b/webrtc/audio/audio_receive_stream_unittest.cc
index bc071970e14454acb3aaa76c7d7b472dd547c05e..0ce0f04c6e681b549692db43a2baf2898b026ec8 100644
--- a/webrtc/audio/audio_receive_stream_unittest.cc
+++ b/webrtc/audio/audio_receive_stream_unittest.cc
@@ -72,7 +72,8 @@ struct ConfigHelper {
         congestion_controller_(&simulated_clock_,
                                &bitrate_observer_,
                                &remote_bitrate_observer_,
-                               &event_log_),
+                               &event_log_,
+                               &packet_router_),
         audio_mixer_(new rtc::RefCountedObject<MockAudioMixer>()) {
     using testing::Invoke;
 
@@ -104,8 +105,6 @@ struct ConfigHelper {
           EXPECT_CALL(*channel_proxy_,
               RegisterReceiverCongestionControlObjects(&packet_router_))
                   .Times(1);
-          EXPECT_CALL(congestion_controller_, packet_router())
-              .WillOnce(Return(&packet_router_));
           EXPECT_CALL(*channel_proxy_, ResetCongestionControlObjects())
               .Times(1);
           EXPECT_CALL(*channel_proxy_, RegisterExternalTransport(nullptr))
@@ -134,6 +133,7 @@ struct ConfigHelper {
     stream_config_.decoder_factory = decoder_factory_;
   }
 
+  PacketRouter* packet_router() { return &packet_router_; }
   MockCongestionController* congestion_controller() {
     return &congestion_controller_;
   }
@@ -261,8 +261,9 @@ TEST(AudioReceiveStreamTest, ConfigToString) {
 TEST(AudioReceiveStreamTest, ConstructDestruct) {
   ConfigHelper helper;
   internal::AudioReceiveStream recv_stream(
-      helper.congestion_controller(), helper.config(), helper.audio_state(),
-      helper.event_log());
+      helper.packet_router(),
+      helper.congestion_controller()->GetRemoteBitrateEstimator(true),
+      helper.config(), helper.audio_state(), helper.event_log());
 }
 
 MATCHER_P(VerifyHeaderExtension, expected_extension, "") {
@@ -277,8 +278,9 @@ TEST(AudioReceiveStreamTest, ReceiveRtpPacket) {
   helper.config().rtp.transport_cc = true;
   helper.SetupMockForBweFeedback(true);
   internal::AudioReceiveStream recv_stream(
-      helper.congestion_controller(), helper.config(), helper.audio_state(),
-      helper.event_log());
+      helper.packet_router(),
+      helper.congestion_controller()->GetRemoteBitrateEstimator(true),
+      helper.config(), helper.audio_state(), helper.event_log());
   const int kTransportSequenceNumberValue = 1234;
   std::vector<uint8_t> rtp_packet = CreateRtpHeaderWithOneByteExtension(
       kTransportSequenceNumberId, kTransportSequenceNumberValue, 2);
@@ -306,8 +308,9 @@ TEST(AudioReceiveStreamTest, ReceiveRtcpPacket) {
   helper.config().rtp.transport_cc = true;
   helper.SetupMockForBweFeedback(true);
   internal::AudioReceiveStream recv_stream(
-      helper.congestion_controller(), helper.config(), helper.audio_state(),
-      helper.event_log());
+      helper.packet_router(),
+      helper.congestion_controller()->GetRemoteBitrateEstimator(true),
+      helper.config(), helper.audio_state(), helper.event_log());
 
   std::vector<uint8_t> rtcp_packet = CreateRtcpSenderReport();
   EXPECT_CALL(*helper.channel_proxy(),
@@ -319,8 +322,9 @@ TEST(AudioReceiveStreamTest, ReceiveRtcpPacket) {
 TEST(AudioReceiveStreamTest, GetStats) {
   ConfigHelper helper;
   internal::AudioReceiveStream recv_stream(
-      helper.congestion_controller(), helper.config(), helper.audio_state(),
-      helper.event_log());
+      helper.packet_router(),
+      helper.congestion_controller()->GetRemoteBitrateEstimator(true),
+      helper.config(), helper.audio_state(), helper.event_log());
   helper.SetupMockForGetStats();
   AudioReceiveStream::Stats stats = recv_stream.GetStats();
   EXPECT_EQ(kRemoteSsrc, stats.remote_ssrc);
@@ -364,8 +368,9 @@ TEST(AudioReceiveStreamTest, GetStats) {
 TEST(AudioReceiveStreamTest, SetGain) {
   ConfigHelper helper;
   internal::AudioReceiveStream recv_stream(
-      helper.congestion_controller(), helper.config(), helper.audio_state(),
-      helper.event_log());
+      helper.packet_router(),
+      helper.congestion_controller()->GetRemoteBitrateEstimator(true),
+      helper.config(), helper.audio_state(), helper.event_log());
   EXPECT_CALL(*helper.channel_proxy(),
       SetChannelOutputVolumeScaling(FloatEq(0.765f)));
   recv_stream.SetGain(0.765f);
@@ -374,8 +379,9 @@ TEST(AudioReceiveStreamTest, SetGain) {
 TEST(AudioReceiveStreamTest, StreamShouldNotBeAddedToMixerWhenVoEReturnsError) {
   ConfigHelper helper;
   internal::AudioReceiveStream recv_stream(
-      helper.congestion_controller(), helper.config(), helper.audio_state(),
-      helper.event_log());
+      helper.packet_router(),
+      helper.congestion_controller()->GetRemoteBitrateEstimator(true),
+      helper.config(), helper.audio_state(), helper.event_log());
 
   EXPECT_CALL(helper.voice_engine(), StartPlayout(_)).WillOnce(Return(-1));
   EXPECT_CALL(*helper.audio_mixer(), AddSource(_)).Times(0);
@@ -386,8 +392,9 @@ TEST(AudioReceiveStreamTest, StreamShouldNotBeAddedToMixerWhenVoEReturnsError) {
 TEST(AudioReceiveStreamTest, StreamShouldBeAddedToMixerOnStart) {
   ConfigHelper helper;
   internal::AudioReceiveStream recv_stream(
-      helper.congestion_controller(), helper.config(), helper.audio_state(),
-      helper.event_log());
+      helper.packet_router(),
+      helper.congestion_controller()->GetRemoteBitrateEstimator(true),
+      helper.config(), helper.audio_state(), helper.event_log());
 
   EXPECT_CALL(helper.voice_engine(), StartPlayout(_)).WillOnce(Return(0));
   EXPECT_CALL(helper.voice_engine(), StopPlayout(_));