commit d6fbf2a4b100c293e1203db8a1f9044e77ea63cd
author Karl Wiberg <kwiberg@webrtc.org> Tue Feb 27 13:37:31 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Mar 12 13:25:29 2018 +0000
tree 483e1f1b6378b9c81575407ca787634c676ac41d
parent 6fed92485776ca6fa88f51c0f6223206d4e45275

Tests: Pass codec ID argument to audio codecs

Bug: webrtc:8941
Change-Id: Ia6d51dcbf7d69b38f3615e01d3f7031b8f5c31d0
Reviewed-on: https://webrtc-review.googlesource.com/58092
Commit-Queue: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22383}

audio/audio_send_stream_unittest.cc

diff --git a/audio/audio_send_stream_unittest.cc b/audio/audio_send_stream_unittest.cc
index 5b4ff5c..d8ff0fd 100644
--- a/audio/audio_send_stream_unittest.cc
+++ b/audio/audio_send_stream_unittest.cc
@@ -116,8 +116,9 @@
             }
             return rtc::nullopt;
           }));
-  ON_CALL(*factory.get(), MakeAudioEncoderMock(_, _, _))
+  ON_CALL(*factory.get(), MakeAudioEncoderMock(_, _, _, _))
       .WillByDefault(Invoke([](int payload_type, const SdpAudioFormat& format,
+                               rtc::Optional<AudioCodecPairId> codec_pair_id,
                                std::unique_ptr<AudioEncoder>* return_value) {
         *return_value = SetupAudioEncoderMock(payload_type, format);
       }));
@@ -422,9 +423,10 @@
 
   helper.config().audio_network_adaptor_config = kAnaConfigString;
 
-  EXPECT_CALL(helper.mock_encoder_factory(), MakeAudioEncoderMock(_, _, _))
+  EXPECT_CALL(helper.mock_encoder_factory(), MakeAudioEncoderMock(_, _, _, _))
       .WillOnce(Invoke([&kAnaConfigString, &kAnaReconfigString](
                            int payload_type, const SdpAudioFormat& format,
+                           rtc::Optional<AudioCodecPairId> codec_pair_id,
                            std::unique_ptr<AudioEncoder>* return_value) {
         auto mock_encoder = SetupAudioEncoderMock(payload_type, format);
         EXPECT_CALL(*mock_encoder,