Reland "WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType"

webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc

Index: webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
index b15d72fecbb4edb176e92c8bdadf45f5b165af13..eab66e7d3b341079e06de6157409c1bb14e8774b 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
+++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
@@ -15,6 +15,8 @@
 #include "webrtc/base/byteorder.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/system_wrappers/include/sleep.h"
+#include "webrtc/voice_engine/channel_proxy.h"
+#include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace {
   static const unsigned int kReflectorSsrc = 0x0000;
@@ -62,6 +64,9 @@ ConferenceTransport::ConferenceTransport()
 
   EXPECT_EQ(0, local_base_->Init());
   local_sender_ = local_base_->CreateChannel();
+  static_cast<webrtc::VoiceEngineImpl*>(local_voe_)
+      ->GetChannelProxy(local_sender_)
+      ->RegisterLegacyReceiveCodecs();
   EXPECT_EQ(0, local_network_->RegisterExternalTransport(local_sender_, *this));
   EXPECT_EQ(0, local_rtp_rtcp_->SetLocalSSRC(local_sender_, kLocalSsrc));
   EXPECT_EQ(0, local_rtp_rtcp_->
@@ -72,6 +77,9 @@ ConferenceTransport::ConferenceTransport()
 
   EXPECT_EQ(0, remote_base_->Init());
   reflector_ = remote_base_->CreateChannel();
+  static_cast<webrtc::VoiceEngineImpl*>(remote_voe_)
+      ->GetChannelProxy(reflector_)
+      ->RegisterLegacyReceiveCodecs();
   EXPECT_EQ(0, remote_network_->RegisterExternalTransport(reflector_, *this));
   EXPECT_EQ(0, remote_rtp_rtcp_->SetLocalSSRC(reflector_, kReflectorSsrc));
 
@@ -222,6 +230,9 @@ void ConferenceTransport::SetRtt(unsigned int rtt_ms) {
 unsigned int ConferenceTransport::AddStream(std::string file_name,
                                             webrtc::FileFormats format) {
   const int new_sender = remote_base_->CreateChannel();
+  static_cast<webrtc::VoiceEngineImpl*>(remote_voe_)
+      ->GetChannelProxy(new_sender)
+      ->RegisterLegacyReceiveCodecs();
   EXPECT_EQ(0, remote_network_->RegisterExternalTransport(new_sender, *this));
 
   const unsigned int remote_ssrc = kFirstRemoteSsrc + stream_count_++;
@@ -235,6 +246,9 @@ unsigned int ConferenceTransport::AddStream(std::string file_name,
       new_sender, file_name.c_str(), true, false, format, 1.0));
 
   const int new_receiver = local_base_->CreateChannel();
+  static_cast<webrtc::VoiceEngineImpl*>(local_voe_)
+      ->GetChannelProxy(new_receiver)
+      ->RegisterLegacyReceiveCodecs();
   EXPECT_EQ(0, local_base_->AssociateSendChannel(new_receiver, local_sender_));
 
   EXPECT_EQ(0, local_network_->RegisterExternalTransport(new_receiver, *this));