Cast: Simplify code path for RTCP sender report

media/cast/rtcp/rtcp_unittest.cc

Index: media/cast/rtcp/rtcp_unittest.cc
diff --git a/media/cast/rtcp/rtcp_unittest.cc b/media/cast/rtcp/rtcp_unittest.cc
index bfe3d73aca43465c7e9c29c2e2d3f31f45183f22..b8f538857fb67ea744bd234a0a0b5ef97fdbeaef 100644
--- a/media/cast/rtcp/rtcp_unittest.cc
+++ b/media/cast/rtcp/rtcp_unittest.cc
@@ -26,7 +26,6 @@ static const uint32 kSenderSsrc = 0x10203;
 static const uint32 kReceiverSsrc = 0x40506;
 static const std::string kCName("test@10.1.1.1");
 static const uint32 kRtcpIntervalMs = 500;
-static const int64 kStartMillisecond = INT64_C(12345678900000);
 static const int64 kAddedDelay = 123;
 static const int64 kAddedShortDelay = 100;
 
@@ -158,10 +157,8 @@ class RtcpTest : public ::testing::Test {
             task_runner_,
             task_runner_)),
         sender_to_receiver_(testing_clock_),
-        receiver_to_sender_(cast_environment_, testing_clock_),
-        rtp_sender_stats_(kVideoFrequency) {
-    testing_clock_->Advance(
-        base::TimeDelta::FromMilliseconds(kStartMillisecond));
+        receiver_to_sender_(cast_environment_, testing_clock_) {
+    testing_clock_->Advance(base::TimeTicks::Now() - base::TimeTicks());
     net::IPEndPoint dummy_endpoint;
     transport_sender_.reset(new transport::CastTransportSenderImpl(
         NULL,
@@ -172,6 +169,10 @@ class RtcpTest : public ::testing::Test {
         base::TimeDelta(),
         task_runner_,
         &sender_to_receiver_));
+    transport::CastTransportAudioConfig config;
+    config.rtp.config.ssrc = kSenderSsrc;
+    config.rtp.max_outstanding_frames = 1;
+    transport_sender_->InitializeAudio(config);
     EXPECT_CALL(mock_sender_feedback_, OnReceivedCastFeedback(_)).Times(0);
   }
 
@@ -198,14 +199,12 @@ class RtcpTest : public ::testing::Test {
   scoped_ptr<transport::CastTransportSenderImpl> transport_sender_;
   LocalRtcpTransport receiver_to_sender_;
   MockRtcpSenderFeedback mock_sender_feedback_;
-  RtpSenderStatistics rtp_sender_stats_;
 
   DISALLOW_COPY_AND_ASSIGN(RtcpTest);
 };
 
 TEST_F(RtcpTest, TimeToSend) {
-  base::TimeTicks start_time;
-  start_time += base::TimeDelta::FromMilliseconds(kStartMillisecond);
+  base::TimeTicks start_time = testing_clock_->NowTicks();
   Rtcp rtcp(cast_environment_,
             &mock_sender_feedback_,
             transport_sender_.get(),
@@ -240,7 +239,7 @@ TEST_F(RtcpTest, BasicSenderReport) {
             kCName,
             true);
   sender_to_receiver_.set_rtcp_receiver(&rtcp);
-  rtcp.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+  rtcp.SendRtcpFromRtpSender(base::TimeTicks(), 0);
 }
 
 TEST_F(RtcpTest, BasicReceiverReport) {
@@ -325,7 +324,7 @@ TEST_F(RtcpTest, RttReducedSizeRtcp) {
   EXPECT_FALSE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
   EXPECT_FALSE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
 
-  rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+  rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 1);
   RunTasks(33);
   rtcp_receiver.SendRtcpFromRtpReceiver(NULL, NULL);
   EXPECT_TRUE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
@@ -334,7 +333,7 @@ TEST_F(RtcpTest, RttReducedSizeRtcp) {
   EXPECT_NEAR(2 * kAddedDelay, avg_rtt.InMilliseconds(), 2);
   EXPECT_NEAR(2 * kAddedDelay, min_rtt.InMilliseconds(), 2);
   EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 2);
-  rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+  rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 2);
   RunTasks(33);
   EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
 
@@ -381,7 +380,7 @@ TEST_F(RtcpTest, Rtt) {
   EXPECT_FALSE(rtcp_sender.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
   EXPECT_FALSE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
 
-  rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+  rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 1);
   RunTasks(33);
   rtcp_receiver.SendRtcpFromRtpReceiver(NULL, NULL);
 
@@ -396,7 +395,7 @@ TEST_F(RtcpTest, Rtt) {
   EXPECT_NEAR(2 * kAddedDelay, min_rtt.InMilliseconds(), 2);
   EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 2);
 
-  rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+  rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 2);
   RunTasks(33);
   EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
   EXPECT_NEAR(2 * kAddedDelay, rtt.InMilliseconds(), 2);
@@ -414,7 +413,7 @@ TEST_F(RtcpTest, Rtt) {
   EXPECT_NEAR(kAddedDelay + kAddedShortDelay, min_rtt.InMilliseconds(), 2);
   EXPECT_NEAR(2 * kAddedDelay, max_rtt.InMilliseconds(), 2);
 
-  rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+  rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 3);
   RunTasks(33);
   EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));
   EXPECT_NEAR(2 * kAddedShortDelay, rtt.InMilliseconds(), 1);
@@ -446,8 +445,8 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
                      NULL,
                      kRtcpReducedSize,
                      base::TimeDelta::FromMilliseconds(kRtcpIntervalMs),
-                     kSenderSsrc,
                      kReceiverSsrc,
+                     kSenderSsrc,
                      kCName,
                      true);
 
@@ -459,8 +458,8 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
                    NULL,
                    kRtcpReducedSize,
                    base::TimeDelta::FromMilliseconds(kRtcpIntervalMs),
-                   kReceiverSsrc,
                    kSenderSsrc,
+                   kReceiverSsrc,
                    kCName,
                    true);
 
@@ -468,7 +467,7 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
   sender_to_receiver_.set_rtcp_receiver(&rtcp_receiver);
 
   rtcp_receiver.SendRtcpFromRtpReceiver(NULL, NULL);
-  rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+  rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 0);
   RunTasks(33);
 
   base::TimeDelta rtt;
@@ -487,7 +486,7 @@ TEST_F(RtcpTest, RttWithPacketLoss) {
   receiver_to_sender_.set_drop_packets(true);
 
   rtcp_receiver.SendRtcpFromRtpReceiver(NULL, NULL);
-  rtcp_sender.SendRtcpFromRtpSender(rtp_sender_stats_.sender_info());
+  rtcp_sender.SendRtcpFromRtpSender(testing_clock_->NowTicks(), 1);
   RunTasks(33);
 
   EXPECT_TRUE(rtcp_receiver.Rtt(&rtt, &avg_rtt, &min_rtt, &max_rtt));