Moved CreateBuiltinDecoderFactory out to VoEBaseImpl.

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..213a48f769d1bf2290c69fbd0e50139bcb83a22e 100644
--- a/webrtc/voice_engine/channel_manager.h
+++ b/webrtc/voice_engine/channel_manager.h
@@ -16,6 +16,7 @@
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/call/rtc_event_log.h"
 #include "webrtc/system_wrappers/include/atomic32.h"
 #include "webrtc/typedefs.h"
@@ -23,6 +24,7 @@
 namespace webrtc {
 
 class Config;
+class AudioDecoderFactory;
 
 namespace voe {
 
@@ -101,6 +103,11 @@ class ChannelManager {
   // CreateChannel(const Config& external_config) is called.
   ChannelOwner CreateChannel();
   ChannelOwner CreateChannel(const Config& external_config);
+  ChannelOwner CreateChannel(
+      const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);
+  ChannelOwner CreateChannel(
+      const Config& external_config,
+      const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);

[kwiberg-webrtc, 2016/05/25 09:19:16]

Again, a comment about the impending removal of the original two functions?

[ossu, 2016/05/26 12:09:53]

Yeah, as with the other ones, I think we'll keep it like this. Or do you think
moving away from Channel is so far away that deprecating the old interfaces
necessary?

 
   // ChannelOwner.channel() will be NULL if channel_id is invalid or no longer
   // exists. This should be checked with ChannelOwner::IsValid().
@@ -117,7 +124,9 @@ class ChannelManager {
 
  private:
   // Create a channel given a configuration, |config|.
-  ChannelOwner CreateChannelInternal(const Config& config);
+  ChannelOwner CreateChannelInternal(
+      const Config& config,
+      const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory);
 
   uint32_t instance_id_;