Reland "Update rtt on audio only calls".

webrtc/audio/audio_send_stream_unittest.cc

Index: webrtc/audio/audio_send_stream_unittest.cc
diff --git a/webrtc/audio/audio_send_stream_unittest.cc b/webrtc/audio/audio_send_stream_unittest.cc
index dbc49662e6be7c4ebcf25d2d478fcee9091ec00f..be15e63b784253531d39b5fbddb1da05a3d9de44 100644
--- a/webrtc/audio/audio_send_stream_unittest.cc
+++ b/webrtc/audio/audio_send_stream_unittest.cc
@@ -22,6 +22,7 @@
 #include "webrtc/modules/congestion_controller/include/mock/mock_congestion_controller.h"
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitrate_estimator.h"
+#include "webrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_voe_channel_proxy.h"
 #include "webrtc/test/mock_voice_engine.h"
@@ -143,6 +144,8 @@ struct ConfigHelper {
     EXPECT_CALL(*channel_proxy_, SetRtcEventLog(testing::NotNull())).Times(1);
     EXPECT_CALL(*channel_proxy_, SetRtcEventLog(testing::IsNull()))
         .Times(1);  // Destructor resets the event log
+    EXPECT_CALL(*channel_proxy_, SetRtcpRttStats(&rtcp_rtt_stats_))
+        .Times(1);
   }
 
   void SetupMockForSetupSendCodec() {
@@ -157,6 +160,7 @@ struct ConfigHelper {
         .WillOnce(Return(-1));
     EXPECT_CALL(voice_engine_, SetSendCodec(kChannelId, _)).WillOnce(Return(0));
   }
+  RtcpRttStats* rtcp_rtt_stats() { return &rtcp_rtt_stats_; }
 
   void SetupMockForSendTelephoneEvent() {
     EXPECT_TRUE(channel_proxy_);
@@ -220,6 +224,7 @@ struct ConfigHelper {
   AudioProcessing::AudioProcessingStatistics audio_processing_stats_;
   CongestionController congestion_controller_;
   MockRtcEventLog event_log_;
+  MockRtcpRttStats rtcp_rtt_stats_;
   testing::NiceMock<MockLimitObserver> limit_observer_;
   BitrateAllocator bitrate_allocator_;
   // |worker_queue| is defined last to ensure all pending tasks are cancelled
@@ -265,7 +270,7 @@ TEST(AudioSendStreamTest, ConstructDestruct) {
   internal::AudioSendStream send_stream(
       helper.config(), helper.audio_state(), helper.worker_queue(),
       helper.congestion_controller(), helper.bitrate_allocator(),
-      helper.event_log());
+      helper.event_log(), helper.rtcp_rtt_stats());
 }
 
 TEST(AudioSendStreamTest, SendTelephoneEvent) {
@@ -273,7 +278,7 @@ TEST(AudioSendStreamTest, SendTelephoneEvent) {
   internal::AudioSendStream send_stream(
       helper.config(), helper.audio_state(), helper.worker_queue(),
       helper.congestion_controller(), helper.bitrate_allocator(),
-      helper.event_log());
+      helper.event_log(), helper.rtcp_rtt_stats());
   helper.SetupMockForSendTelephoneEvent();
   EXPECT_TRUE(send_stream.SendTelephoneEvent(kTelephoneEventPayloadType,
       kTelephoneEventPayloadFrequency, kTelephoneEventCode,
@@ -285,7 +290,7 @@ TEST(AudioSendStreamTest, SetMuted) {
   internal::AudioSendStream send_stream(
       helper.config(), helper.audio_state(), helper.worker_queue(),
       helper.congestion_controller(), helper.bitrate_allocator(),
-      helper.event_log());
+      helper.event_log(), helper.rtcp_rtt_stats());
   EXPECT_CALL(*helper.channel_proxy(), SetInputMute(true));
   send_stream.SetMuted(true);
 }
@@ -295,7 +300,7 @@ TEST(AudioSendStreamTest, GetStats) {
   internal::AudioSendStream send_stream(
       helper.config(), helper.audio_state(), helper.worker_queue(),
       helper.congestion_controller(), helper.bitrate_allocator(),
-      helper.event_log());
+      helper.event_log(), helper.rtcp_rtt_stats());
   helper.SetupMockForGetStats();
   AudioSendStream::Stats stats = send_stream.GetStats();
   EXPECT_EQ(kSsrc, stats.local_ssrc);
@@ -326,7 +331,7 @@ TEST(AudioSendStreamTest, GetStatsTypingNoiseDetected) {
   internal::AudioSendStream send_stream(
       helper.config(), helper.audio_state(), helper.worker_queue(),
       helper.congestion_controller(), helper.bitrate_allocator(),
-      helper.event_log());
+      helper.event_log(), helper.rtcp_rtt_stats());
   helper.SetupMockForGetStats();
   EXPECT_FALSE(send_stream.GetStats().typing_noise_detected);
 
@@ -380,7 +385,7 @@ TEST(AudioSendStreamTest, SendCodecAppliesConfigParams) {
   internal::AudioSendStream send_stream(
       stream_config, helper.audio_state(), helper.worker_queue(),
       helper.congestion_controller(), helper.bitrate_allocator(),
-      helper.event_log());
+      helper.event_log(), helper.rtcp_rtt_stats());
 }
 
 // VAD is applied when codec is mono and the CNG frequency matches the codec
@@ -397,7 +402,7 @@ TEST(AudioSendStreamTest, SendCodecCanApplyVad) {
   internal::AudioSendStream send_stream(
       stream_config, helper.audio_state(), helper.worker_queue(),
       helper.congestion_controller(), helper.bitrate_allocator(),
-      helper.event_log());
+      helper.event_log(), helper.rtcp_rtt_stats());
 }
 
 }  // namespace test