Open backdoor in VoiceEngineImpl to get at the actual voe::Channel objects from an ID.

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 5efd5b0e1c8b3acd86401a16563cdb92220610d8..96ecb66fcd43a8152783b11b213dcff9adf123b7 100644
--- a/webrtc/audio/audio_receive_stream_unittest.cc
+++ b/webrtc/audio/audio_receive_stream_unittest.cc
@@ -14,6 +14,7 @@
 #include "webrtc/audio/conversion.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/test/mock_voe_channel_proxy.h"
 #include "webrtc/test/mock_voice_engine.h"
 
 namespace webrtc {
@@ -53,6 +54,8 @@ const AudioDecodingCallStats kAudioDecodeStats = MakeAudioDecodeStatsForTest();
 
 struct ConfigHelper {
   ConfigHelper() {
+    using testing::Invoke;
+
     EXPECT_CALL(voice_engine_,
         RegisterVoiceEngineObserver(_)).WillOnce(Return(0));
     EXPECT_CALL(voice_engine_,
@@ -61,8 +64,8 @@ struct ConfigHelper {
     config.voice_engine = &voice_engine_;
     audio_state_ = AudioState::Create(config);
 
-    EXPECT_CALL(voice_engine_, SetLocalSSRC(kChannelId, kLocalSsrc))
-        .WillOnce(Return(0));
+    EXPECT_CALL(voice_engine_, GetChannelProxy(kChannelId))
+        .WillOnce(Invoke(this, &ConfigHelper::CreateChannelProxy));

[kwiberg-webrtc, 2015/11/25 10:44:58]

Can you do this with a lambda instead? Something like

.WillOnce(Invoke([this](int channel_id) {
  EXPECT_FALSE(channel_proxy_);
  channel_proxy_ = new testing::StrictMock<MockVoEChannelProxy>();
  EXPECT_CALL(*channel_proxy_, SetLocalSSRC(kLocalSsrc)).Times(1);
  return channel_proxy_;
}));

Although I don't quite see what you gain by storing the thing in a member
variable.

[the sun, 2015/11/25 12:28:01]

Great idea. I simply didn't think a lambda would work in this case.

channel_proxy_ isn't used right now, but will be once GetStats() direct VoE
calls through the ChannelProxy, and SetupMockForGetStats() as a consequence
needs to add expectations on the ChannelProxy mock.

     EXPECT_CALL(voice_engine_,
         SetReceiveAbsoluteSenderTimeStatus(kChannelId, true, kAbsSendTimeId))
             .WillOnce(Return(0));
@@ -76,7 +79,7 @@ struct ConfigHelper {
         RtpExtension(RtpExtension::kAbsSendTime, kAbsSendTimeId));
     stream_config_.rtp.extensions.push_back(
         RtpExtension(RtpExtension::kAudioLevel, kAudioLevelId));
-}
+  }
 
   MockRemoteBitrateEstimator* remote_bitrate_estimator() {
     return &remote_bitrate_estimator_;
@@ -89,6 +92,7 @@ struct ConfigHelper {
     using testing::DoAll;
     using testing::SetArgPointee;
     using testing::SetArgReferee;
+
     EXPECT_CALL(voice_engine_, GetRTCPStatistics(kChannelId, _))
         .WillOnce(DoAll(SetArgReferee<1>(kCallStats), Return(0)));
     EXPECT_CALL(voice_engine_, GetRecCodec(kChannelId, _))
@@ -106,10 +110,18 @@ struct ConfigHelper {
   }
 
  private:
+  voe::ChannelProxy* CreateChannelProxy(int channel_id) {
+    EXPECT_FALSE(channel_proxy_);
+    channel_proxy_ = new testing::StrictMock<MockVoEChannelProxy>();
+    EXPECT_CALL(*channel_proxy_, SetLocalSSRC(kLocalSsrc)).Times(1);
+    return channel_proxy_;
+  }
+
   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 BuildAbsoluteSendTimeExtension(uint8_t* buffer,