Revert of WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType

webrtc/call/call_unittest.cc

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <list>
-#include <map>
 #include <memory>
 
 #include "webrtc/call/audio_state.h"
 #include "webrtc/call/call.h"
 #include "webrtc/logging/rtc_event_log/rtc_event_log.h"
 #include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
 #include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_transport.h"
 #include "webrtc/test/mock_voice_engine.h"
@@ skipping 112 matching lines @@
 
   // Set up the mock to create a channel proxy which we know of, so that we can
   // add our expectations to it.
   test::MockVoEChannelProxy* recv_channel_proxy = nullptr;
   EXPECT_CALL(*call.voice_engine(), ChannelProxyFactory(testing::_))
       .WillRepeatedly(testing::Invoke([&](int channel_id) {
         test::MockVoEChannelProxy* channel_proxy =
             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) {
           EXPECT_FALSE(recv_channel_proxy);
           recv_channel_proxy = channel_proxy;
         }
         return channel_proxy;
       }));
 
   AudioReceiveStream::Config recv_config;
@@ skipping 27 matching lines @@
 
   // Set up the mock to create a channel proxy which we know of, so that we can
   // add our expectations to it.
   test::MockVoEChannelProxy* recv_channel_proxy = nullptr;
   EXPECT_CALL(*call.voice_engine(), ChannelProxyFactory(testing::_))
       .WillRepeatedly(testing::Invoke([&](int channel_id) {
         test::MockVoEChannelProxy* channel_proxy =
             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) {
           EXPECT_FALSE(recv_channel_proxy);
           recv_channel_proxy = channel_proxy;
           // We need to set this expectation here since the channel proxy is
           // created as a side effect of CreateAudioReceiveStream().
           EXPECT_CALL(*recv_channel_proxy,
                       AssociateSendChannel(testing::_)).Times(1);
         }
@@ skipping 87 matching lines @@
   stream = call->CreateFlexfecReceiveStream(config);
   EXPECT_NE(stream, nullptr);
   streams.push_back(stream);
 
   for (auto s : streams) {
     call->DestroyFlexfecReceiveStream(s);
   }
 }
 
 }  // namespace webrtc