Revert of Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/sender/vp8_quantizer_parser_unittest.cc

Index: media/cast/sender/vp8_quantizer_parser_unittest.cc
diff --git a/media/cast/sender/vp8_quantizer_parser_unittest.cc b/media/cast/sender/vp8_quantizer_parser_unittest.cc
index 65db392e122448b55ccff0807a3a2f6b619320cb..e323a898f2a6b01df9d7a986c15ad8cf5492ecc1 100644
--- a/media/cast/sender/vp8_quantizer_parser_unittest.cc
+++ b/media/cast/sender/vp8_quantizer_parser_unittest.cc
@@ -26,14 +26,14 @@
 const int kFrameRate = 10;
 const int kQp = 20;
 
-FrameSenderConfig GetVideoConfigForTest() {
-  FrameSenderConfig config = GetDefaultVideoSenderConfig();
+VideoSenderConfig GetVideoConfigForTest() {
+  VideoSenderConfig config = GetDefaultVideoSenderConfig();
   config.codec = CODEC_VIDEO_VP8;
   config.use_external_encoder = false;
   config.max_frame_rate = kFrameRate;
-  config.video_codec_params.min_qp = kQp;
-  config.video_codec_params.max_qp = kQp;
-  config.video_codec_params.max_cpu_saver_qp = kQp;
+  config.min_qp = kQp;
+  config.max_qp = kQp;
+  config.max_cpu_saver_qp = kQp;
   return config;
 }
 }  // unnamed namespace
@@ -58,9 +58,9 @@
   // Update the vp8 encoder with the new quantizer.
   void UpdateQuantizer(int qp) {
     DCHECK((qp > 3) && (qp < 64));
-    video_config_.video_codec_params.min_qp = qp;
-    video_config_.video_codec_params.max_qp = qp;
-    video_config_.video_codec_params.max_cpu_saver_qp = qp;
+    video_config_.min_qp = qp;
+    video_config_.max_qp = qp;
+    video_config_.max_cpu_saver_qp = qp;
     RecreateVp8Encoder();
   }
 
@@ -79,7 +79,7 @@
   }
 
   base::TimeDelta next_frame_timestamp_;
-  FrameSenderConfig video_config_;
+  VideoSenderConfig video_config_;
   std::unique_ptr<Vp8Encoder> vp8_encoder_;
 
   DISALLOW_COPY_AND_ASSIGN(Vp8QuantizerParserTest);