| Index: webrtc/media/engine/webrtcvoiceengine.cc
 | 
| diff --git a/webrtc/media/engine/webrtcvoiceengine.cc b/webrtc/media/engine/webrtcvoiceengine.cc
 | 
| index 9f544c18262d13e812186b46e9a8f79277077bf3..a919f57e4d989d1d3900d73161eecd229c93803f 100644
 | 
| --- a/webrtc/media/engine/webrtcvoiceengine.cc
 | 
| +++ b/webrtc/media/engine/webrtcvoiceengine.cc
 | 
| @@ -37,6 +37,7 @@
 | 
|  #include "webrtc/media/engine/webrtcmediaengine.h"
 | 
|  #include "webrtc/media/engine/webrtcvoe.h"
 | 
|  #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 | 
| +#include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
 | 
|  #include "webrtc/modules/audio_processing/include/audio_processing.h"
 | 
|  #include "webrtc/system_wrappers/include/field_trial.h"
 | 
|  #include "webrtc/system_wrappers/include/trace.h"
 | 
| @@ -279,6 +280,7 @@ void GetOpusConfig(const AudioCodec& codec,
 | 
|  webrtc::AudioState::Config MakeAudioStateConfig(VoEWrapper* voe_wrapper) {
 | 
|    webrtc::AudioState::Config config;
 | 
|    config.voice_engine = voe_wrapper->engine();
 | 
| +  config.audio_mixer = webrtc::AudioMixerImpl::Create();
 | 
|    return config;
 | 
|  }
 | 
|  
 | 
| 
 |