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..4c443e0f2e99c11391713c0f789326aef2ae2c9f 100644
--- a/webrtc/audio/audio_receive_stream_unittest.cc
+++ b/webrtc/audio/audio_receive_stream_unittest.cc
@@ -17,11 +17,9 @@
 #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h"
 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
 #include "webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h"
-#include "webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_voe_channel_proxy.h"
 #include "webrtc/test/mock_voice_engine.h"
@@ -67,12 +65,7 @@ const AudioDecodingCallStats kAudioDecodeStats = MakeAudioDecodeStatsForTest();
 
 struct ConfigHelper {
   ConfigHelper()
-      : simulated_clock_(123456),
-        decoder_factory_(new rtc::RefCountedObject<MockAudioDecoderFactory>),
-        congestion_controller_(&simulated_clock_,
-                               &bitrate_observer_,
-                               &remote_bitrate_observer_,
-                               &event_log_),
+      : decoder_factory_(new rtc::RefCountedObject<MockAudioDecoderFactory>),
         audio_mixer_(new rtc::RefCountedObject<MockAudioMixer>()) {
     using testing::Invoke;
 
@@ -104,8 +97,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,9 +125,7 @@ struct ConfigHelper {
     stream_config_.decoder_factory = decoder_factory_;
   }
 
-  MockCongestionController* congestion_controller() {
-    return &congestion_controller_;
-  }
+  PacketRouter* packet_router() { return &packet_router_; }
   MockRemoteBitrateEstimator* remote_bitrate_estimator() {
     return &remote_bitrate_estimator_;
   }
@@ -148,9 +137,6 @@ struct ConfigHelper {
   MockVoEChannelProxy* channel_proxy() { return channel_proxy_; }
 
   void SetupMockForBweFeedback(bool send_side_bwe) {
-    EXPECT_CALL(congestion_controller_,
-                GetRemoteBitrateEstimator(send_side_bwe))
-        .WillOnce(Return(&remote_bitrate_estimator_));
     EXPECT_CALL(remote_bitrate_estimator_,
                 RemoveStream(stream_config_.rtp.remote_ssrc));
   }
@@ -176,12 +162,8 @@ struct ConfigHelper {
   }
 
  private:
-  SimulatedClock simulated_clock_;
   PacketRouter packet_router_;
-  testing::NiceMock<MockCongestionObserver> bitrate_observer_;
-  testing::NiceMock<MockRemoteBitrateObserver> remote_bitrate_observer_;
   rtc::scoped_refptr<AudioDecoderFactory> decoder_factory_;
-  MockCongestionController congestion_controller_;
   MockRemoteBitrateEstimator remote_bitrate_estimator_;
   MockRtcEventLog event_log_;
   testing::StrictMock<MockVoiceEngine> voice_engine_;
@@ -261,8 +243,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.remote_bitrate_estimator(),
+      helper.config(), helper.audio_state(), helper.event_log());
 }
 
 MATCHER_P(VerifyHeaderExtension, expected_extension, "") {
@@ -277,8 +260,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.remote_bitrate_estimator(),
+      helper.config(), helper.audio_state(), helper.event_log());
   const int kTransportSequenceNumberValue = 1234;
   std::vector<uint8_t> rtp_packet = CreateRtpHeaderWithOneByteExtension(
       kTransportSequenceNumberId, kTransportSequenceNumberValue, 2);
@@ -306,8 +290,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.remote_bitrate_estimator(),
+      helper.config(), helper.audio_state(), helper.event_log());
 
   std::vector<uint8_t> rtcp_packet = CreateRtcpSenderReport();
   EXPECT_CALL(*helper.channel_proxy(),
@@ -319,8 +304,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.remote_bitrate_estimator(),
+      helper.config(), helper.audio_state(), helper.event_log());
   helper.SetupMockForGetStats();
   AudioReceiveStream::Stats stats = recv_stream.GetStats();
   EXPECT_EQ(kRemoteSsrc, stats.remote_ssrc);
@@ -364,8 +350,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.remote_bitrate_estimator(),
+      helper.config(), helper.audio_state(), helper.event_log());
   EXPECT_CALL(*helper.channel_proxy(),
       SetChannelOutputVolumeScaling(FloatEq(0.765f)));
   recv_stream.SetGain(0.765f);
@@ -374,8 +361,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.remote_bitrate_estimator(),
+      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 +374,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.remote_bitrate_estimator(),
+      helper.config(), helper.audio_state(), helper.event_log());
 
   EXPECT_CALL(helper.voice_engine(), StartPlayout(_)).WillOnce(Return(0));
   EXPECT_CALL(helper.voice_engine(), StopPlayout(_));