Clean up of CongestionController.

webrtc/audio/audio_receive_stream_unittest.cc

 /*
  *  Copyright (c) 2015 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 49 matching lines @@
 const CodecInst kCodecInst = {
     123, "codec_name_recv", 96000, -187, 0, -103};
 const NetworkStatistics kNetworkStats = {
     123, 456, false, 0, 0, 789, 12, 345, 678, 901, -1, -1, -1, -1, -1, 0};
 const AudioDecodingCallStats kAudioDecodeStats = MakeAudioDecodeStatsForTest();
 
 struct ConfigHelper {
   ConfigHelper()
       : simulated_clock_(123456),
         call_stats_(&simulated_clock_),
-        congestion_controller_(&process_thread_,
+        congestion_controller_(&simulated_clock_,
+                               &process_thread_,
                                &call_stats_,
-                               &bitrate_observer_) {
+                               &bitrate_observer_,
+                               &remote_bitrate_observer_) {
     using testing::Invoke;
 
     EXPECT_CALL(voice_engine_,
         RegisterVoiceEngineObserver(_)).WillOnce(Return(0));
     EXPECT_CALL(voice_engine_,
         DeRegisterVoiceEngineObserver()).WillOnce(Return(0));
     AudioState::Config config;
     config.voice_engine = &voice_engine_;
     audio_state_ = AudioState::Create(config);
 
@@ skipping 67 matching lines @@
 
     EXPECT_CALL(voice_engine_, GetRecCodec(kChannelId, _))
         .WillOnce(DoAll(SetArgReferee<1>(kCodecInst), Return(0)));
   }
 
  private:
   SimulatedClock simulated_clock_;
   CallStats call_stats_;
   PacketRouter packet_router_;
   testing::NiceMock<MockBitrateObserver> bitrate_observer_;
+  testing::NiceMock<MockRemoteBitrateObserver> remote_bitrate_observer_;
   testing::NiceMock<MockProcessThread> process_thread_;
   MockCongestionController congestion_controller_;
   MockRemoteBitrateEstimator remote_bitrate_estimator_;
   testing::StrictMock<MockVoiceEngine> voice_engine_;
   rtc::scoped_refptr<AudioState> audio_state_;
   AudioReceiveStream::Config stream_config_;
   testing::StrictMock<MockVoEChannelProxy>* channel_proxy_ = nullptr;
 };
 
 void BuildOneByteExtension(std::vector<uint8_t>::iterator it,
@@ skipping 128 matching lines @@
   EXPECT_EQ(kAudioDecodeStats.calls_to_neteq, stats.decoding_calls_to_neteq);
   EXPECT_EQ(kAudioDecodeStats.decoded_normal, stats.decoding_normal);
   EXPECT_EQ(kAudioDecodeStats.decoded_plc, stats.decoding_plc);
   EXPECT_EQ(kAudioDecodeStats.decoded_cng, stats.decoding_cng);
   EXPECT_EQ(kAudioDecodeStats.decoded_plc_cng, stats.decoding_plc_cng);
   EXPECT_EQ(kCallStats.capture_start_ntp_time_ms_,
             stats.capture_start_ntp_time_ms);
 }
 }  // namespace test
 }  // namespace webrtc