Set RtcpSender transport at construction.

webrtc/video/video_send_stream_tests.cc

Index: webrtc/video/video_send_stream_tests.cc
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 688278eadca40159af3b52d9d160c40375322e56..f4fabdeb7f619e30479e60967b9500951b11e353 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -329,8 +329,8 @@ TEST_F(VideoSendStreamTest, SupportsFec) {
         FakeReceiveStatistics lossy_receive_stats(
             kSendSsrcs[0], header.sequenceNumber, send_count_ / 2, 127);
         RTCPSender rtcp_sender(false, Clock::GetRealTimeClock(),
-                               &lossy_receive_stats, nullptr);
-        EXPECT_EQ(0, rtcp_sender.RegisterSendTransport(&transport_adapter_));
+                               &lossy_receive_stats, nullptr,
+                               &transport_adapter_);
 
         rtcp_sender.SetRTCPStatus(kRtcpNonCompound);
         rtcp_sender.SetRemoteSSRC(kSendSsrcs[0]);
@@ -411,8 +411,7 @@ void VideoSendStreamTest::TestNackRetransmission(
         nacked_sequence_number_ = nack_sequence_number;
         NullReceiveStatistics null_stats;
         RTCPSender rtcp_sender(false, Clock::GetRealTimeClock(), &null_stats,
-                               nullptr);
-        EXPECT_EQ(0, rtcp_sender.RegisterSendTransport(&transport_adapter_));
+                               nullptr, &transport_adapter_);
 
         rtcp_sender.SetRTCPStatus(kRtcpNonCompound);
         rtcp_sender.SetRemoteSSRC(kSendSsrcs[0]);
@@ -598,8 +597,8 @@ void VideoSendStreamTest::TestPacketFragmentationSize(VideoFormat format,
         FakeReceiveStatistics lossy_receive_stats(
             kSendSsrcs[0], header.sequenceNumber, packet_count_ / 2, 127);
         RTCPSender rtcp_sender(false, Clock::GetRealTimeClock(),
-                               &lossy_receive_stats, nullptr);
-        EXPECT_EQ(0, rtcp_sender.RegisterSendTransport(&transport_adapter_));
+                               &lossy_receive_stats, nullptr,
+                               &transport_adapter_);
 
         rtcp_sender.SetRTCPStatus(kRtcpNonCompound);
         rtcp_sender.SetRemoteSSRC(kSendSsrcs[0]);
@@ -828,8 +827,8 @@ TEST_F(VideoSendStreamTest, SuspendBelowMinBitrate) {
         EXCLUSIVE_LOCKS_REQUIRED(crit_) {
       FakeReceiveStatistics receive_stats(
           kSendSsrcs[0], last_sequence_number_, rtp_count_, 0);
-      RTCPSender rtcp_sender(false, clock_, &receive_stats, nullptr);
-      EXPECT_EQ(0, rtcp_sender.RegisterSendTransport(&transport_adapter_));
+      RTCPSender rtcp_sender(false, clock_, &receive_stats, nullptr,
+                             &transport_adapter_);
 
       rtcp_sender.SetRTCPStatus(kRtcpNonCompound);
       rtcp_sender.SetRemoteSSRC(kSendSsrcs[0]);
@@ -888,8 +887,7 @@ TEST_F(VideoSendStreamTest, NoPaddingWhenVideoIsMuted) {
       // Receive statistics reporting having lost 50% of the packets.
       FakeReceiveStatistics receive_stats(kSendSsrcs[0], 1, 1, 0);
       RTCPSender rtcp_sender(false, Clock::GetRealTimeClock(), &receive_stats,
-                             nullptr);
-      EXPECT_EQ(0, rtcp_sender.RegisterSendTransport(&transport_adapter_));
+                             nullptr, &transport_adapter_);
 
       rtcp_sender.SetRTCPStatus(kRtcpNonCompound);
       rtcp_sender.SetRemoteSSRC(kSendSsrcs[0]);