Support external audio mixer in webrtc 2.

webrtc/media/base/fakemediaengine.h

Index: webrtc/media/base/fakemediaengine.h
diff --git a/webrtc/media/base/fakemediaengine.h b/webrtc/media/base/fakemediaengine.h
index dc547f8f10de17ba32a8d0ca7740968a7b8d993b..932427b9b41ef845dbab57da9a1e84d5fb01d649 100644
--- a/webrtc/media/base/fakemediaengine.h
+++ b/webrtc/media/base/fakemediaengine.h
@@ -753,10 +753,10 @@ class FakeBaseEngine {
 
 class FakeVoiceEngine : public FakeBaseEngine {
  public:
-  FakeVoiceEngine(
-      webrtc::AudioDeviceModule* adm,
-      const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
-          audio_decoder_factory) {
+  FakeVoiceEngine(webrtc::AudioDeviceModule* adm,
+                  const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
+                      audio_decoder_factory,
+                  rtc::scoped_refptr<webrtc::AudioMixer> audio_mixer) {
     // Add a fake audio codec. Note that the name must not be "" as there are
     // sanity checks against that.
     codecs_.push_back(AudioCodec(101, "fake_audio_codec", 0, 0, 1));
@@ -864,6 +864,7 @@ class FakeMediaEngine :
  public:
   FakeMediaEngine()
       : CompositeMediaEngine<FakeVoiceEngine, FakeVideoEngine>(nullptr,
+                                                               nullptr,
                                                                nullptr) {}
   virtual ~FakeMediaEngine() {}