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

Unified Diff: talk/app/webrtc/rtpsenderreceiver_unittest.cc

Issue 1398823003: Remove MediaChannel::SetRemoteRenderer(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 2 months 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
« no previous file with comments | « talk/app/webrtc/rtpreceiver.cc ('k') | talk/app/webrtc/webrtcsession.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/rtpsenderreceiver_unittest.cc
diff --git a/talk/app/webrtc/rtpsenderreceiver_unittest.cc b/talk/app/webrtc/rtpsenderreceiver_unittest.cc
index b69221bfb6d1a89b1693fd5c786272c430387f82..c9d7e008c300475dd8c06aa09d4e4cd141381987 100644
--- a/talk/app/webrtc/rtpsenderreceiver_unittest.cc
+++ b/talk/app/webrtc/rtpsenderreceiver_unittest.cc
@@ -56,10 +56,9 @@ namespace webrtc {
class MockAudioProvider : public AudioProviderInterface {
public:
virtual ~MockAudioProvider() {}
- MOCK_METHOD3(SetAudioPlayout,
+ MOCK_METHOD2(SetAudioPlayout,
void(uint32_t ssrc,
- bool enable,
- cricket::AudioRenderer* renderer));
+ bool enable));
MOCK_METHOD4(SetAudioSend,
void(uint32_t ssrc,
bool enable,
@@ -150,7 +149,7 @@ class RtpSenderReceiverTest : public testing::Test {
audio_track_ =
AudioTrack::Create(kAudioTrackId, RemoteAudioSource::Create().get());
EXPECT_TRUE(stream_->AddTrack(audio_track_));
- EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, true, _));
+ EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, true));
audio_rtp_receiver_ = new AudioRtpReceiver(stream_->GetAudioTracks()[0],
kAudioSsrc, &audio_provider_);
}
@@ -164,7 +163,7 @@ class RtpSenderReceiverTest : public testing::Test {
}
void DestroyAudioRtpReceiver() {
- EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, false, _));
+ EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, false));
audio_rtp_receiver_ = nullptr;
}
@@ -228,10 +227,10 @@ TEST_F(RtpSenderReceiverTest, LocalAudioTrackDisable) {
TEST_F(RtpSenderReceiverTest, RemoteAudioTrackDisable) {
CreateAudioRtpReceiver();
- EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, false, _));
+ EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, false));
audio_track_->set_enabled(false);
- EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, true, _));
+ EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, true));
audio_track_->set_enabled(true);
DestroyAudioRtpReceiver();
@@ -267,11 +266,11 @@ TEST_F(RtpSenderReceiverTest, RemoteAudioTrackSetVolume) {
audio_track_->GetSource()->SetVolume(volume);
// Disable the audio track, this should prevent setting the volume.
- EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, false, _));
+ EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, false));
audio_track_->set_enabled(false);
audio_track_->GetSource()->SetVolume(1.0);
- EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, true, _));
+ EXPECT_CALL(audio_provider_, SetAudioPlayout(kAudioSsrc, true));
audio_track_->set_enabled(true);
double new_volume = 0.8;
« no previous file with comments | « talk/app/webrtc/rtpreceiver.cc ('k') | talk/app/webrtc/webrtcsession.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698