Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1051)

Unified Diff: webrtc/audio/audio_receive_stream_unittest.cc

Issue 2436033002: Replace AudioConferenceMixer with AudioMixer. (Closed)
Patch Set: Consistent thread checker, errcode handling in RecStream. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 f263948fc4a8e09308fee1ff1b771f253c145686..1755988fa723891a7d68de0849abbed342c2e949 100644
--- a/webrtc/audio/audio_receive_stream_unittest.cc
+++ b/webrtc/audio/audio_receive_stream_unittest.cc
@@ -119,10 +119,9 @@ struct ConfigHelper {
EXPECT_CALL(*channel_proxy_, SetRtcEventLog(testing::IsNull()))
.Times(1)
.After(expect_set);
- EXPECT_CALL(*channel_proxy_, DisassociateSendChannel()).Times(1);
+ // EXPECT_CALL(*channel_proxy_, DisassociateSendChannel()).Times(1);
the sun 2016/11/16 20:22:57 Uncomment
aleloi 2016/11/17 18:12:26 Done. Still wondering what happened when I uploade
return channel_proxy_;
}));
- EXPECT_CALL(voice_engine_, StopPlayout(kChannelId)).WillOnce(Return(0));
stream_config_.voe_channel_id = kChannelId;
stream_config_.rtp.local_ssrc = kLocalSsrc;
stream_config_.rtp.remote_ssrc = kRemoteSsrc;

Powered by Google App Engine
This is Rietveld 408576698