Moved creation of AudioDecoderFactory to inside PeerConnectionFactory.

webrtc/media/engine/webrtcvoiceengine.h

Index: webrtc/media/engine/webrtcvoiceengine.h
diff --git a/webrtc/media/engine/webrtcvoiceengine.h b/webrtc/media/engine/webrtcvoiceengine.h
index 5b435348e65e97d0c50d52ac06bc7e044b1f9f4c..89aff7ef71f67678803b34d10d9f32eabf4c25f6 100644
--- a/webrtc/media/engine/webrtcvoiceengine.h
+++ b/webrtc/media/engine/webrtcvoiceengine.h
@@ -46,9 +46,14 @@ class WebRtcVoiceEngine final : public webrtc::TraceCallback  {
   // Exposed for the WVoE/MC unit test.
   static bool ToCodecInst(const AudioCodec& in, webrtc::CodecInst* out);
 
-  explicit WebRtcVoiceEngine(webrtc::AudioDeviceModule* adm);
+  explicit WebRtcVoiceEngine(

[kwiberg-webrtc, 2016/05/30 10:04:27]

I don't think the constructor needs to be explicit now that it takes a non-1
number of arguments.

[ossu, 2016/05/30 12:49:25]

Acknowledged.

+      webrtc::AudioDeviceModule* adm,
+      const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& decoder_factory);
   // Dependency injection for testing.
-  WebRtcVoiceEngine(webrtc::AudioDeviceModule* adm, VoEWrapper* voe_wrapper);
+  WebRtcVoiceEngine(
+      webrtc::AudioDeviceModule* adm,
+      const rtc::scoped_refptr<webrtc::AudioDecoderFactory>& decoder_factory,
+      VoEWrapper* voe_wrapper);
   ~WebRtcVoiceEngine() override;
 
   rtc::scoped_refptr<webrtc::AudioState> GetAudioState() const;
@@ -112,6 +117,7 @@ class WebRtcVoiceEngine final : public webrtc::TraceCallback  {
 
   // The audio device manager.
   rtc::scoped_refptr<webrtc::AudioDeviceModule> adm_;
+  rtc::scoped_refptr<webrtc::AudioDecoderFactory> decoder_factory_;
   // The primary instance of WebRtc VoiceEngine.
   std::unique_ptr<VoEWrapper> voe_wrapper_;
   rtc::scoped_refptr<webrtc::AudioState> audio_state_;