Reland of https://codereview.webrtc.org/2396483002/

webrtc/modules/audio_mixer/audio_source_with_mix_status.cc

Index: webrtc/modules/audio_mixer/audio_source_with_mix_status.cc
diff --git a/webrtc/modules/audio_mixer/audio_mixer_defines.cc b/webrtc/modules/audio_mixer/audio_source_with_mix_status.cc
similarity index 54%
rename from webrtc/modules/audio_mixer/audio_mixer_defines.cc
rename to webrtc/modules/audio_mixer/audio_source_with_mix_status.cc
index 7779bedfddde7273419b91bac63a96e6d6ecd0d6..40ccad4ad7d72e8e0a9f191dbb91ea8b53dd4718 100644
--- a/webrtc/modules/audio_mixer/audio_mixer_defines.cc
+++ b/webrtc/modules/audio_mixer/audio_source_with_mix_status.cc
@@ -8,31 +8,36 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_mixer/audio_mixer_defines.h"
+#include "webrtc/modules/audio_mixer/audio_source_with_mix_status.h"
 
 namespace webrtc {
 
-MixerAudioSource::MixerAudioSource() {}
+AudioSourceWithMixStatus::AudioSourceWithMixStatus(
+    MixerAudioSource* audio_source)
+    : audio_source_(audio_source) {}
 
-MixerAudioSource::~MixerAudioSource() {}
+AudioSourceWithMixStatus::~AudioSourceWithMixStatus() {}
 
-bool MixerAudioSource::IsMixed() const {
+bool AudioSourceWithMixStatus::IsMixed() const {
   return is_mixed_;
 }
 
-bool MixerAudioSource::WasMixed() const {
+bool AudioSourceWithMixStatus::WasMixed() const {
   // Was mixed is the same as is mixed depending on perspective. This function
   // is for the perspective of AudioMixerImpl.
   return IsMixed();
 }
 
-int32_t MixerAudioSource::SetIsMixed(const bool mixed) {
+void AudioSourceWithMixStatus::SetIsMixed(const bool mixed) {
   is_mixed_ = mixed;
-  return 0;
 }
 
-void MixerAudioSource::ResetMixedStatus() {
+void AudioSourceWithMixStatus::ResetMixedStatus() {
   is_mixed_ = false;
 }
 
+MixerAudioSource* AudioSourceWithMixStatus::audio_source() const {
+  return audio_source_;
+}
+
 }  // namespace webrtc