Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/sender/audio_sender_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/cast/sender/audio_sender.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <utility>
@@ skipping 87 matching lines @@
     testing_clock_ = new base::SimpleTestTickClock();
     testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
     task_runner_ = new FakeSingleThreadTaskRunner(testing_clock_);
     cast_environment_ =
         new CastEnvironment(std::unique_ptr<base::TickClock>(testing_clock_),
                             task_runner_, task_runner_, task_runner_);
     audio_config_.codec = CODEC_AUDIO_OPUS;
     audio_config_.use_external_encoder = false;
     audio_config_.frequency = kDefaultAudioSamplingRate;
     audio_config_.channels = 2;
-    audio_config_.bitrate = kDefaultAudioEncoderBitrate;
-    audio_config_.rtp_payload_type = 127;
+    audio_config_.max_bitrate = kDefaultAudioEncoderBitrate;
+    audio_config_.rtp_payload_type = RtpPayloadType::AUDIO_OPUS;
 
     transport_ = new TestPacketSender();
     transport_sender_.reset(
         new CastTransportImpl(testing_clock_, base::TimeDelta(),
                               base::WrapUnique(new TransportClient()),
                               base::WrapUnique(transport_), task_runner_));
     OperationalStatus operational_status = STATUS_UNINITIALIZED;
     audio_sender_.reset(new AudioSender(
         cast_environment_,
         audio_config_,
         base::Bind(&SaveOperationalStatus, &operational_status),
         transport_sender_.get()));
     task_runner_->RunTasks();
     CHECK_EQ(STATUS_INITIALIZED, operational_status);
   }
 
   ~AudioSenderTest() override {}
 
   base::SimpleTestTickClock* testing_clock_;  // Owned by CastEnvironment.
   TestPacketSender* transport_;               // Owned by CastTransport.
   std::unique_ptr<CastTransportImpl> transport_sender_;
   scoped_refptr<FakeSingleThreadTaskRunner> task_runner_;
   std::unique_ptr<AudioSender> audio_sender_;
   scoped_refptr<CastEnvironment> cast_environment_;
-  AudioSenderConfig audio_config_;
+  FrameSenderConfig audio_config_;
 };
 
 TEST_F(AudioSenderTest, Encode20ms) {
   const base::TimeDelta kDuration = base::TimeDelta::FromMilliseconds(20);
   std::unique_ptr<AudioBus> bus(
       TestAudioBusFactory(audio_config_.channels, audio_config_.frequency,
                           TestAudioBusFactory::kMiddleANoteFreq, 0.5f)
           .NextAudioBus(kDuration));
 
   audio_sender_->InsertAudio(std::move(bus), testing_clock_->NowTicks());
@@ skipping 16 matching lines @@
   base::TimeDelta max_rtcp_timeout =
       base::TimeDelta::FromMilliseconds(1 + kRtcpReportIntervalMs * 3 / 2);
   testing_clock_->Advance(max_rtcp_timeout);
   task_runner_->RunTasks();
   EXPECT_LE(1, transport_->number_of_rtp_packets());
   EXPECT_LE(1, transport_->number_of_rtcp_packets());
 }
 
 }  // namespace cast
 }  // namespace media