WIP: Move the creation of AudioCodecFactory into PeerConnectionFactory.

webrtc/voice_engine/channel_manager.cc

Index: webrtc/voice_engine/channel_manager.cc
diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc
index 6071f19548edf1c8447d512e8a36f86d10ab6ff7..1177f42e333f4d69f93bddda311c95f6e0384381 100644
--- a/webrtc/voice_engine/channel_manager.cc
+++ b/webrtc/voice_engine/channel_manager.cc
@@ -51,18 +51,23 @@ ChannelManager::ChannelManager(uint32_t instance_id, const Config& config)
       config_(config),
       event_log_(RtcEventLog::Create(Clock::GetRealTimeClock())) {}
 
-ChannelOwner ChannelManager::CreateChannel() {
-  return CreateChannelInternal(config_);
+ChannelOwner ChannelManager::CreateChannel(
+    std::shared_ptr<AudioDecoderFactory> decoder_factory) {
+  return CreateChannelInternal(config_, std::move(decoder_factory));
 }
 
-ChannelOwner ChannelManager::CreateChannel(const Config& external_config) {
-  return CreateChannelInternal(external_config);
+ChannelOwner ChannelManager::CreateChannel(
+    const Config& external_config,
+    std::shared_ptr<AudioDecoderFactory> decoder_factory) {
+  return CreateChannelInternal(external_config, std::move(decoder_factory));
 }
 
-ChannelOwner ChannelManager::CreateChannelInternal(const Config& config) {
+ChannelOwner ChannelManager::CreateChannelInternal(
+    const Config& config,
+    std::shared_ptr<AudioDecoderFactory> decoder_factory) {
   Channel* channel;
   Channel::CreateChannel(channel, ++last_channel_id_, instance_id_,
-                         event_log_.get(), config);
+                         event_log_.get(), config, std::move(decoder_factory));
   ChannelOwner channel_owner(channel);
 
   rtc::CritScope crit(&lock_);