Revert of Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/test/end2end_unittest.cc

Index: media/cast/test/end2end_unittest.cc
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index c1012325b69e8d163d6522789236cbdcf8c4d15e..c29e3cc73136db468a6888b7542f62e9fe4d02dc 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -432,15 +432,15 @@
   }
 
   void Configure(Codec video_codec, Codec audio_codec) {
-    audio_sender_config_.sender_ssrc = 1;
+    audio_sender_config_.ssrc = 1;
     audio_sender_config_.receiver_ssrc = 2;
     audio_sender_config_.max_playout_delay =
         base::TimeDelta::FromMilliseconds(kTargetPlayoutDelayMs);
     audio_sender_config_.rtp_payload_type = RtpPayloadType::AUDIO_OPUS;
     audio_sender_config_.use_external_encoder = false;
-    audio_sender_config_.rtp_timebase = kDefaultAudioSamplingRate;
+    audio_sender_config_.frequency = kDefaultAudioSamplingRate;
     audio_sender_config_.channels = kAudioChannels;
-    audio_sender_config_.max_bitrate = kDefaultAudioEncoderBitrate;
+    audio_sender_config_.bitrate = kDefaultAudioEncoderBitrate;
     audio_sender_config_.codec = audio_codec;
     audio_sender_config_.aes_iv_mask =
         ConvertFromBase16String("abcdeffedcba12345678900987654321");
@@ -449,11 +449,11 @@
 
     audio_receiver_config_.receiver_ssrc =
         audio_sender_config_.receiver_ssrc;
-    audio_receiver_config_.sender_ssrc = audio_sender_config_.sender_ssrc;
+    audio_receiver_config_.sender_ssrc = audio_sender_config_.ssrc;
     audio_receiver_config_.rtp_max_delay_ms = kTargetPlayoutDelayMs;
     audio_receiver_config_.rtp_payload_type =
         audio_sender_config_.rtp_payload_type;
-    audio_receiver_config_.rtp_timebase = audio_sender_config_.rtp_timebase;
+    audio_receiver_config_.rtp_timebase = audio_sender_config_.frequency;
     audio_receiver_config_.channels = kAudioChannels;
     audio_receiver_config_.target_frame_rate = 100;
     audio_receiver_config_.codec = audio_sender_config_.codec;
@@ -463,7 +463,7 @@
     test_receiver_audio_callback_->SetExpectedSamplingFrequency(
         audio_receiver_config_.rtp_timebase);
 
-    video_sender_config_.sender_ssrc = 3;
+    video_sender_config_.ssrc = 3;
     video_sender_config_.receiver_ssrc = 4;
     video_sender_config_.max_playout_delay =
         base::TimeDelta::FromMilliseconds(kTargetPlayoutDelayMs);
@@ -472,8 +472,8 @@
     video_sender_config_.max_bitrate = 50000;
     video_sender_config_.min_bitrate = 10000;
     video_sender_config_.start_bitrate = 10000;
-    video_sender_config_.video_codec_params.max_qp = 30;
-    video_sender_config_.video_codec_params.min_qp = 4;
+    video_sender_config_.max_qp = 30;
+    video_sender_config_.min_qp = 4;
     video_sender_config_.max_frame_rate = 30;
     video_sender_config_.codec = video_codec;
     video_sender_config_.aes_iv_mask =
@@ -483,7 +483,7 @@
 
     video_receiver_config_.receiver_ssrc =
         video_sender_config_.receiver_ssrc;
-    video_receiver_config_.sender_ssrc = video_sender_config_.sender_ssrc;
+    video_receiver_config_.sender_ssrc = video_sender_config_.ssrc;
     video_receiver_config_.rtp_max_delay_ms = kTargetPlayoutDelayMs;
     video_receiver_config_.rtp_payload_type =
         video_sender_config_.rtp_payload_type;
@@ -834,8 +834,8 @@
 
   FrameReceiverConfig audio_receiver_config_;
   FrameReceiverConfig video_receiver_config_;
-  FrameSenderConfig audio_sender_config_;
-  FrameSenderConfig video_sender_config_;
+  AudioSenderConfig audio_sender_config_;
+  VideoSenderConfig video_sender_config_;
 
   base::TimeTicks start_time_;
 
@@ -958,7 +958,7 @@
   video_frame_input_ = cast_sender_->video_frame_input();
 
   audio_bus_factory_.reset(new TestAudioBusFactory(
-      audio_sender_config_.channels, audio_sender_config_.rtp_timebase,
+      audio_sender_config_.channels, audio_sender_config_.frequency,
       kSoundFrequency, kSoundVolume));
 }