Moved MixerAudioSource and removed audio_mixer_defines.h.

webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc

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 98c8bec270b42bdc02576fb8ef920cfdca88ae9b..9c571a093a87efe868380ed26af34027fe2b3411 100644
--- a/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc
+++ b/webrtc/modules/audio_mixer/test/audio_mixer_unittest.cc
@@ -16,7 +16,7 @@
 #include "webrtc/base/bind.h"
 #include "webrtc/base/thread.h"
 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
-#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
+#include "webrtc/modules/audio_mixer/audio_mixer.h"
 #include "webrtc/test/gmock.h"
 
 using testing::_;
@@ -48,10 +48,10 @@ AudioFrame frame_for_mixing;
 
 }  // namespace
 
-class MockMixerAudioSource : public MixerAudioSource {
+class MockMixerAudioSource : public AudioMixer::Source {
  public:
   MockMixerAudioSource()
-      : fake_audio_frame_info_(MixerAudioSource::AudioFrameInfo::kNormal) {
+      : fake_audio_frame_info_(AudioMixer::Source::AudioFrameInfo::kNormal) {
     ON_CALL(*this, GetAudioFrameWithMuted(_, _))
         .WillByDefault(
             Invoke(this, &MockMixerAudioSource::FakeAudioFrameWithMuted));
@@ -83,7 +83,7 @@ class MockMixerAudioSource : public MixerAudioSource {
 // to the mixer. Compares mixed status with |expected_status|
 void MixAndCompare(
     const std::vector<AudioFrame>& frames,
-    const std::vector<MixerAudioSource::AudioFrameInfo>& frame_info,
+    const std::vector<AudioMixer::Source::AudioFrameInfo>& frame_info,
     const std::vector<bool>& expected_status) {
   int num_audio_sources = frames.size();
   RTC_DCHECK(frames.size() == frame_info.size());
@@ -442,9 +442,9 @@ TEST(AudioMixer, MutedShouldMixAfterUnmuted) {
     ResetFrame(&frame);
   }
 
-  std::vector<MixerAudioSource::AudioFrameInfo> frame_info(
-      kAudioSources, MixerAudioSource::AudioFrameInfo::kNormal);
-  frame_info[0] = MixerAudioSource::AudioFrameInfo::kMuted;
+  std::vector<AudioMixer::Source::AudioFrameInfo> frame_info(
+      kAudioSources, AudioMixer::Source::AudioFrameInfo::kNormal);
+  frame_info[0] = AudioMixer::Source::AudioFrameInfo::kMuted;
   std::vector<bool> expected_status(kAudioSources, true);
   expected_status[0] = false;
 
@@ -460,8 +460,8 @@ TEST(AudioMixer, PassiveShouldMixAfterNormal) {
     ResetFrame(&frame);
   }
 
-  std::vector<MixerAudioSource::AudioFrameInfo> frame_info(
-      kAudioSources, MixerAudioSource::AudioFrameInfo::kNormal);
+  std::vector<AudioMixer::Source::AudioFrameInfo> frame_info(
+      kAudioSources, AudioMixer::Source::AudioFrameInfo::kNormal);
   frames[0].vad_activity_ = AudioFrame::kVadPassive;
   std::vector<bool> expected_status(kAudioSources, true);
   expected_status[0] = false;
@@ -478,8 +478,8 @@ TEST(AudioMixer, ActiveShouldMixBeforeLoud) {
     ResetFrame(&frame);
   }
 
-  std::vector<MixerAudioSource::AudioFrameInfo> frame_info(
-      kAudioSources, MixerAudioSource::AudioFrameInfo::kNormal);
+  std::vector<AudioMixer::Source::AudioFrameInfo> frame_info(
+      kAudioSources, AudioMixer::Source::AudioFrameInfo::kNormal);
   frames[0].vad_activity_ = AudioFrame::kVadPassive;
   std::fill(frames[0].data_, frames[0].data_ + kDefaultSampleRateHz / 100,
             std::numeric_limits<int16_t>::max());
@@ -498,9 +498,9 @@ TEST(AudioMixer, UnmutedShouldMixBeforeLoud) {
     ResetFrame(&frame);
   }
 
-  std::vector<MixerAudioSource::AudioFrameInfo> frame_info(
-      kAudioSources, MixerAudioSource::AudioFrameInfo::kNormal);
-  frame_info[0] = MixerAudioSource::AudioFrameInfo::kMuted;
+  std::vector<AudioMixer::Source::AudioFrameInfo> frame_info(
+      kAudioSources, AudioMixer::Source::AudioFrameInfo::kNormal);
+  frame_info[0] = AudioMixer::Source::AudioFrameInfo::kMuted;
   std::fill(frames[0].data_, frames[0].data_ + kDefaultSampleRateHz / 100,
             std::numeric_limits<int16_t>::max());
   std::vector<bool> expected_status(kAudioSources, true);