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

webrtc/call/call_unittest.cc

Index: webrtc/call/call_unittest.cc
diff --git a/webrtc/call/call_unittest.cc b/webrtc/call/call_unittest.cc
index 99d6812d687cf8ca4db2f793f81c27b9aece4c83..a45b91cb727b28ce22dbf60b61c6b11a393197fa 100644
--- a/webrtc/call/call_unittest.cc
+++ b/webrtc/call/call_unittest.cc
@@ -9,6 +9,7 @@
  */
 
 #include <list>
+#include <map>
 #include <memory>
 
 #include "webrtc/call/audio_state.h"
@@ -141,6 +142,11 @@ TEST(CallTest, CreateDestroy_AssociateAudioSendReceiveStreams_RecvFirst) {
             new testing::NiceMock<test::MockVoEChannelProxy>();
         EXPECT_CALL(*channel_proxy, GetAudioDecoderFactory())
             .WillRepeatedly(testing::ReturnRef(decoder_factory));
+        EXPECT_CALL(*channel_proxy, SetReceiveCodecs(testing::_))
+            .WillRepeatedly(testing::Invoke(
+                [](const std::map<int, SdpAudioFormat>& codecs) {
+                  EXPECT_THAT(codecs, testing::IsEmpty());
+                }));
         // If being called for the send channel, save a pointer to the channel
         // proxy for later.
         if (channel_id == kRecvChannelId) {
@@ -188,6 +194,11 @@ TEST(CallTest, CreateDestroy_AssociateAudioSendReceiveStreams_SendFirst) {
             new testing::NiceMock<test::MockVoEChannelProxy>();
         EXPECT_CALL(*channel_proxy, GetAudioDecoderFactory())
             .WillRepeatedly(testing::ReturnRef(decoder_factory));
+        EXPECT_CALL(*channel_proxy, SetReceiveCodecs(testing::_))
+            .WillRepeatedly(testing::Invoke(
+                [](const std::map<int, SdpAudioFormat>& codecs) {
+                  EXPECT_THAT(codecs, testing::IsEmpty());
+                }));
         // If being called for the send channel, save a pointer to the channel
         // proxy for later.
         if (channel_id == kRecvChannelId) {