Revert of Refactoring: Merge VideoSenderConfig and AudioSenderConfig.

media/cast/test/cast_benchmarks.cc

Index: media/cast/test/cast_benchmarks.cc
diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc
index 018b287c25f91b7bf2cfa1c5084397bb1271d6bb..4bebe4a02d460cb712a505efa26ed5aa3a52dca1 100644
--- a/media/cast/test/cast_benchmarks.cc
+++ b/media/cast/test/cast_benchmarks.cc
@@ -258,9 +258,8 @@
     video_receiver_config_.rtp_max_delay_ms = kTargetPlayoutDelayMs;
     video_receiver_config_.codec = video_codec;
 
-    DCHECK_GT(video_sender_config_.max_frame_rate, 0);
-    frame_duration_ = base::TimeDelta::FromSecondsD(
-        1.0 / video_sender_config_.max_frame_rate);
+    frame_duration_ = base::TimeDelta::FromSeconds(1) /
+        video_sender_config_.max_frame_rate;
   }
 
   void SetSenderClockSkew(double skew, base::TimeDelta offset) {
@@ -286,8 +285,8 @@
   }
 
   base::TimeDelta VideoTimestamp(int frame_number) {
-    return frame_number * base::TimeDelta::FromSecondsD(
-                              1.0 / video_sender_config_.max_frame_rate);
+    return (frame_number * base::TimeDelta::FromSeconds(1)) /
+        video_sender_config_.max_frame_rate;
   }
 
   void SendFakeVideoFrame() {
@@ -411,8 +410,8 @@
  private:
   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_;