[Cast] Clean-up: Merge AudioReceiverConfig+VideoReceiverConfig-->FrameReceiverConfig.

media/cast/test/utility/default_config.cc

Index: media/cast/test/utility/default_config.cc
diff --git a/media/cast/test/utility/default_config.cc b/media/cast/test/utility/default_config.cc
index 1631bfe86b5660e176a2b4d69aa6487020084b83..b5de5ed69068be4285de39c9c4438562f7b8492a 100644
--- a/media/cast/test/utility/default_config.cc
+++ b/media/cast/test/utility/default_config.cc
@@ -25,27 +25,31 @@ void CreateVideoEncodeMemory(
 namespace media {
 namespace cast {
 
-AudioReceiverConfig GetDefaultAudioReceiverConfig() {
-  AudioReceiverConfig config;
+FrameReceiverConfig GetDefaultAudioReceiverConfig() {
+  FrameReceiverConfig config;
   config.feedback_ssrc = 2;
   config.incoming_ssrc = 1;
-  config.rtp_payload_type = 127;
   config.rtcp_c_name = "audio_receiver@a.b.c.d";
-  config.use_external_decoder = false;
+  config.rtp_max_delay_ms = kDefaultRtpMaxDelayMs;
+  config.rtp_payload_type = 127;
   config.frequency = 48000;
   config.channels = 2;
-  config.codec = media::cast::transport::kOpus;
+  config.max_frame_rate = 100;  // 10ms of signal per frame
+  config.codec.audio = media::cast::transport::kOpus;
   return config;
 }
 
-VideoReceiverConfig GetDefaultVideoReceiverConfig() {
-  VideoReceiverConfig config;
+FrameReceiverConfig GetDefaultVideoReceiverConfig() {
+  FrameReceiverConfig config;
   config.feedback_ssrc = 12;
   config.incoming_ssrc = 11;
-  config.rtp_payload_type = 96;
   config.rtcp_c_name = "video_receiver@a.b.c.d";
-  config.use_external_decoder = false;
-  config.codec = media::cast::transport::kVp8;
+  config.rtp_max_delay_ms = kDefaultRtpMaxDelayMs;
+  config.rtp_payload_type = 96;
+  config.frequency = kVideoFrequency;
+  config.channels = 1;
+  config.max_frame_rate = kDefaultMaxFrameRate;
+  config.codec.video = media::cast::transport::kVp8;
   return config;
 }