Simplifying audio network adaptor by moving receiver frame length range to ctor.

webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc

Index: webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
index 6a4c47c0e33a189bcb910a5290dfd7facad3905f..74411f20a15d43d0ad3643d0a31eea7b3a88e52b 100644
--- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
+++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc
@@ -51,7 +51,8 @@ AudioEncoderOpusStates CreateCodec(size_t num_channels) {
   std::weak_ptr<MockAudioNetworkAdaptor*> mock_ptr(
       states.mock_audio_network_adaptor);
   AudioEncoderOpus::AudioNetworkAdaptorCreator creator = [mock_ptr](
-      const std::string&, const Clock*) {
+      const std::string&, int min_receiver_frame_length_ms,
+      int max_receiver_frame_length_ms, const Clock*) {
     std::unique_ptr<MockAudioNetworkAdaptor> adaptor(
         new NiceMock<MockAudioNetworkAdaptor>());
     EXPECT_CALL(*adaptor, Die());
@@ -224,8 +225,7 @@ TEST(AudioEncoderOpusTest, PacketLossRateOptimized) {
 
 TEST(AudioEncoderOpusTest, InvokeAudioNetworkAdaptorOnSetUplinkBandwidth) {
   auto states = CreateCodec(2);
-  printf("passed!\n");
-  states.encoder->EnableAudioNetworkAdaptor("", nullptr);
+  states.encoder->EnableAudioNetworkAdaptor("", 0, 0, nullptr);
 
   auto config = CreateEncoderRuntimeConfig();
   EXPECT_CALL(**states.mock_audio_network_adaptor, GetEncoderRuntimeConfig())
@@ -243,7 +243,7 @@ TEST(AudioEncoderOpusTest, InvokeAudioNetworkAdaptorOnSetUplinkBandwidth) {
 TEST(AudioEncoderOpusTest,
      InvokeAudioNetworkAdaptorOnSetUplinkPacketLossFraction) {
   auto states = CreateCodec(2);
-  states.encoder->EnableAudioNetworkAdaptor("", nullptr);
+  states.encoder->EnableAudioNetworkAdaptor("", 0, 0, nullptr);
 
   auto config = CreateEncoderRuntimeConfig();
   EXPECT_CALL(**states.mock_audio_network_adaptor, GetEncoderRuntimeConfig())
@@ -260,7 +260,7 @@ TEST(AudioEncoderOpusTest,
 
 TEST(AudioEncoderOpusTest, InvokeAudioNetworkAdaptorOnSetTargetAudioBitrate) {
   auto states = CreateCodec(2);
-  states.encoder->EnableAudioNetworkAdaptor("", nullptr);
+  states.encoder->EnableAudioNetworkAdaptor("", 0, 0, nullptr);
 
   auto config = CreateEncoderRuntimeConfig();
   EXPECT_CALL(**states.mock_audio_network_adaptor, GetEncoderRuntimeConfig())
@@ -277,7 +277,7 @@ TEST(AudioEncoderOpusTest, InvokeAudioNetworkAdaptorOnSetTargetAudioBitrate) {
 
 TEST(AudioEncoderOpusTest, InvokeAudioNetworkAdaptorOnSetRtt) {
   auto states = CreateCodec(2);
-  states.encoder->EnableAudioNetworkAdaptor("", nullptr);
+  states.encoder->EnableAudioNetworkAdaptor("", 0, 0, nullptr);
 
   auto config = CreateEncoderRuntimeConfig();
   EXPECT_CALL(**states.mock_audio_network_adaptor, GetEncoderRuntimeConfig())
@@ -292,24 +292,6 @@ TEST(AudioEncoderOpusTest, InvokeAudioNetworkAdaptorOnSetRtt) {
 }
 
 TEST(AudioEncoderOpusTest,
-     InvokeAudioNetworkAdaptorOnSetReceiverFrameLengthRange) {
-  auto states = CreateCodec(2);
-  states.encoder->EnableAudioNetworkAdaptor("", nullptr);
-
-  auto config = CreateEncoderRuntimeConfig();
-  EXPECT_CALL(**states.mock_audio_network_adaptor, GetEncoderRuntimeConfig())
-      .WillOnce(Return(config));
-
-  constexpr int kMinFrameLength = 10;
-  constexpr int kMaxFrameLength = 60;
-  EXPECT_CALL(**states.mock_audio_network_adaptor,
-              SetReceiverFrameLengthRange(kMinFrameLength, kMaxFrameLength));
-  states.encoder->SetReceiverFrameLengthRange(kMinFrameLength, kMaxFrameLength);
-
-  CheckEncoderRuntimeConfig(states.encoder.get(), config);
-}
-
-TEST(AudioEncoderOpusTest,
      PacketLossFractionSmoothedOnSetUplinkPacketLossFraction) {
   auto states = CreateCodec(2);