Revert of Support external audio mixer.

webrtc/media/base/mediaengine.h

 /*
  *  Copyright (c) 2004 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
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 15 matching lines @@
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/videocommon.h"
 #include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
 
 #if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
 #define DISABLE_MEDIA_ENGINE_FACTORY
 #endif
 
 namespace webrtc {
 class AudioDeviceModule;
-class AudioMixer;
 class Call;
 }
 
 namespace cricket {
 
 struct RtpCapabilities {
   std::vector<webrtc::RtpExtension> header_extensions;
 };
 
 // MediaEngineInterface is an abstraction of a media engine which can be
@@ skipping 57 matching lines @@
  private:
   static MediaEngineCreateFunction create_function_;
 };
 #endif
 
 // CompositeMediaEngine constructs a MediaEngine from separate
 // voice and video engine classes.
 template<class VOICE, class VIDEO>
 class CompositeMediaEngine : public MediaEngineInterface {
  public:
-  CompositeMediaEngine(webrtc::AudioDeviceModule* adm,
-                       const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
-                           audio_decoder_factory,
-                       rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer)
-      : voice_(adm, audio_decoder_factory, audio_mixer) {}
+  CompositeMediaEngine(
+      webrtc::AudioDeviceModule* adm,
+      const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
+          audio_decoder_factory)
+      : voice_(adm, audio_decoder_factory) {}
   virtual ~CompositeMediaEngine() {}
   virtual bool Init() {
     video_.Init();
     return true;
   }
 
   virtual rtc::scoped_refptr<webrtc::AudioState> GetAudioState() const {
     return voice_.GetAudioState();
   }
   virtual VoiceMediaChannel* CreateChannel(webrtc::Call* call,
@@ skipping 44 matching lines @@
   virtual ~DataEngineInterface() {}
   virtual DataMediaChannel* CreateChannel(DataChannelType type) = 0;
   virtual const std::vector<DataCodec>& data_codecs() = 0;
 };
 
 webrtc::RtpParameters CreateRtpParametersWithOneEncoding();
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_MEDIAENGINE_H_