Wire-up BWE feedback for audio receive streams.

webrtc/audio/audio_send_stream_unittest.cc

Index: webrtc/audio/audio_send_stream_unittest.cc
diff --git a/webrtc/audio/audio_send_stream_unittest.cc b/webrtc/audio/audio_send_stream_unittest.cc
index 3b1b44af34661726bb50323c7d77171e6cd35fad..a4cd020cc5c6ac6751d7e110bdbb77c68c2676b4 100644
--- a/webrtc/audio/audio_send_stream_unittest.cc
+++ b/webrtc/audio/audio_send_stream_unittest.cc
@@ -17,7 +17,7 @@
 #include "webrtc/audio/audio_state.h"
 #include "webrtc/audio/conversion.h"
 #include "webrtc/call/congestion_controller.h"
-#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
+#include "webrtc/modules/bitrate_controller/include/mock/mock_bitrate_controller.h"
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/test/mock_voe_channel_proxy.h"
 #include "webrtc/test/mock_voice_engine.h"
@@ -67,11 +67,10 @@ struct ConfigHelper {
     AudioState::Config config;
     config.voice_engine = &voice_engine_;
     audio_state_ = AudioState::Create(config);
+    channel_proxy_ = new testing::StrictMock<MockVoEChannelProxy>();

[the sun, 2015/12/20 23:16:15]

Why did this move?

[stefan-webrtc, 2015/12/21 08:01:29]

Sorry, I can move this back. I had to move it initially, but fixed the
underlying problem has been fixed.

[the sun, 2015/12/22 00:14:13]

Please do.

 
     EXPECT_CALL(voice_engine_, ChannelProxyFactory(kChannelId))
         .WillOnce(Invoke([this](int channel_id) {
-          EXPECT_FALSE(channel_proxy_);
-          channel_proxy_ = new testing::StrictMock<MockVoEChannelProxy>();
           EXPECT_CALL(*channel_proxy_, SetRTCPStatus(true)).Times(1);
           EXPECT_CALL(*channel_proxy_, SetLocalSSRC(kSsrc)).Times(1);
           EXPECT_CALL(*channel_proxy_, SetRTCP_CNAME(StrEq(kCName))).Times(1);
@@ -154,19 +153,12 @@ struct ConfigHelper {
   }
 
  private:
-  class NullBitrateObserver : public BitrateObserver {
-   public:
-    virtual void OnNetworkChanged(uint32_t bitrate_bps,
-                                  uint8_t fraction_loss,
-                                  int64_t rtt_ms) {}
-  };
-
   testing::StrictMock<MockVoiceEngine> voice_engine_;
   rtc::scoped_refptr<AudioState> audio_state_;
   AudioSendStream::Config stream_config_;
   testing::StrictMock<MockVoEChannelProxy>* channel_proxy_ = nullptr;
   CallStats call_stats_;
-  NullBitrateObserver bitrate_observer_;
+  testing::NiceMock<MockBitrateObserver> bitrate_observer_;
   rtc::scoped_ptr<ProcessThread> process_thread_;
   CongestionController congestion_controller_;
 };