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 4bebe4a02d460cb712a505efa26ed5aa3a52dca1..ca33c74a53a15110eb8d865924550be9c3bf2d17 100644
--- a/media/cast/test/cast_benchmarks.cc
+++ b/media/cast/test/cast_benchmarks.cc
@@ -258,8 +258,9 @@ class RunOneBenchmark {
     video_receiver_config_.rtp_max_delay_ms = kTargetPlayoutDelayMs;
     video_receiver_config_.codec = video_codec;
 
-    frame_duration_ = base::TimeDelta::FromSeconds(1) /
-        video_sender_config_.max_frame_rate;
+    DCHECK_GT(video_sender_config_.max_frame_rate, 0);
+    frame_duration_ =
+        base::TimeDelta::FromSeconds(1.0 / video_sender_config_.max_frame_rate);

[miu, 2016/07/06 21:20:26]

s/FromSeconds/FromSecondsD/

[xjz, 2016/07/06 23:57:39]

Done.

   }
 
   void SetSenderClockSkew(double skew, base::TimeDelta offset) {
@@ -285,8 +286,8 @@ class RunOneBenchmark {
   }
 
   base::TimeDelta VideoTimestamp(int frame_number) {
-    return (frame_number * base::TimeDelta::FromSeconds(1)) /
-        video_sender_config_.max_frame_rate;
+    return frame_number * base::TimeDelta::FromSeconds(

[miu, 2016/07/06 21:20:26]

s/FromSeconds/FromSecondsD/

[xjz, 2016/07/06 23:57:39]

Done.

+                              1.0 / video_sender_config_.max_frame_rate);
   }
 
   void SendFakeVideoFrame() {
@@ -410,8 +411,8 @@ class RunOneBenchmark {
  private:
   FrameReceiverConfig audio_receiver_config_;
   FrameReceiverConfig video_receiver_config_;
-  AudioSenderConfig audio_sender_config_;
-  VideoSenderConfig video_sender_config_;
+  FrameSenderConfig audio_sender_config_;
+  FrameSenderConfig video_sender_config_;
 
   base::TimeTicks start_time_;