Removed callback between old AudioConferenceMixer and OutputMixer. The audio frame with mixed audio…

webrtc/modules/audio_mixer/include/audio_mixer_defines.h

Index: webrtc/modules/audio_mixer/include/audio_mixer_defines.h
diff --git a/webrtc/modules/audio_mixer/include/audio_mixer_defines.h b/webrtc/modules/audio_mixer/include/audio_mixer_defines.h
index 3aa5c6b8cc831cf9731c265112745c528c447181..594645fe9edb55524440501a3ab65005c1ba50f4 100644
--- a/webrtc/modules/audio_mixer/include/audio_mixer_defines.h
+++ b/webrtc/modules/audio_mixer/include/audio_mixer_defines.h
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -64,21 +64,6 @@ class MixerAudioSource {
   MixerAudioSource();
   virtual ~MixerAudioSource();
 };
-
-class OldAudioMixerOutputReceiver {
- public:
-  // This callback function provides the mixed audio for this mix iteration.
-  // Note that uniqueAudioFrames is an array of AudioFrame pointers with the
-  // size according to the size parameter.
-  virtual void NewMixedAudio(const int32_t id,
-                             const AudioFrame& generalAudioFrame,
-                             const AudioFrame** uniqueAudioFrames,
-                             const uint32_t size) = 0;
-
- protected:
-  OldAudioMixerOutputReceiver() {}
-  virtual ~OldAudioMixerOutputReceiver() {}
-};
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_MIXER_INCLUDE_AUDIO_MIXER_DEFINES_H_