WIP: Move the creation of AudioCodecFactory into PeerConnectionFactory.

webrtc/voice_engine/channel_manager.h

Index: webrtc/voice_engine/channel_manager.h
diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h
index 77dfc454d882f0ecece0859c657331c3720bb1a8..97f925332f4828f066f0cf67037b39524280b2de 100644
--- a/webrtc/voice_engine/channel_manager.h
+++ b/webrtc/voice_engine/channel_manager.h
@@ -23,6 +23,7 @@
 namespace webrtc {
 
 class Config;
+class AudioDecoderFactory;
 
 namespace voe {
 
@@ -99,8 +100,11 @@ class ChannelManager {
   // calling CreateChannel(), or using and external configuration
   // |external_config| if the overloaded method
   // CreateChannel(const Config& external_config) is called.
-  ChannelOwner CreateChannel();
-  ChannelOwner CreateChannel(const Config& external_config);
+  ChannelOwner CreateChannel(
+      std::shared_ptr<AudioDecoderFactory> decoder_factory);
+  ChannelOwner CreateChannel(
+      const Config& external_config,
+      std::shared_ptr<AudioDecoderFactory> decoder_factory);
 
   // ChannelOwner.channel() will be NULL if channel_id is invalid or no longer
   // exists. This should be checked with ChannelOwner::IsValid().
@@ -117,7 +121,9 @@ class ChannelManager {
 
  private:
   // Create a channel given a configuration, |config|.
-  ChannelOwner CreateChannelInternal(const Config& config);
+  ChannelOwner CreateChannelInternal(
+      const Config& config,
+      std::shared_ptr<AudioDecoderFactory> decoder_factory);
 
   uint32_t instance_id_;