| Index: webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc
|
| diff --git a/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc b/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc
|
| index bfc00fd32dc79985df3c3fa41091e57989286458..bd8b5adabad0d968a8d90412fc01ab0c10ccea3e 100644
|
| --- a/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc
|
| +++ b/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc
|
| @@ -14,8 +14,8 @@
|
| #include <utility>
|
|
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| -#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
|
| #include "webrtc/modules/audio_mixer/audio_mixer.h"
|
| +#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
|
|
|
| using testing::_;
|
| using testing::Exactly;
|
| @@ -285,11 +285,12 @@ TEST(AudioMixer, ParticipantNumberOfChannels) {
|
| ResetFrame(participant.fake_frame());
|
|
|
| EXPECT_EQ(0, mixer->SetMixabilityStatus(&participant, true));
|
| - for (size_t number_of_channels : {1, 2}) {
|
| + for (int number_of_channels : {1, 2}) {
|
| EXPECT_CALL(participant, GetAudioFrameWithMuted(_, kDefaultSampleRateHz))
|
| .Times(Exactly(1));
|
| mixer->Mix(kDefaultSampleRateHz, number_of_channels, &frame_for_mixing);
|
| - EXPECT_EQ(number_of_channels, frame_for_mixing.num_channels_);
|
| + EXPECT_EQ(static_cast<size_t>(number_of_channels),
|
| + frame_for_mixing.num_channels_);
|
| }
|
| }
|
|
|
|
|