| Index: webrtc/pc/rtcstatscollector_unittest.cc
|
| diff --git a/webrtc/pc/rtcstatscollector_unittest.cc b/webrtc/pc/rtcstatscollector_unittest.cc
|
| index e698cf513a8dcff23ee1ee7d2c11d39c3ccf754b..4ed338dc6aea884c8e128d9d06b68176374126d0 100644
|
| --- a/webrtc/pc/rtcstatscollector_unittest.cc
|
| +++ b/webrtc/pc/rtcstatscollector_unittest.cc
|
| @@ -1938,7 +1938,6 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) {
|
| voice_media_info.senders[0].local_stats[0].ssrc = 1;
|
| voice_media_info.senders[0].packets_sent = 2;
|
| voice_media_info.senders[0].bytes_sent = 3;
|
| - voice_media_info.senders[0].rtt_ms = -1;
|
| voice_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42);
|
|
|
| RtpCodecParameters codec_parameters;
|
| @@ -1984,22 +1983,12 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Audio) {
|
| expected_audio.codec_id = "RTCCodec_OutboundAudio_42";
|
| expected_audio.packets_sent = 2;
|
| expected_audio.bytes_sent = 3;
|
| - // |expected_audio.round_trip_time| should be undefined.
|
|
|
| ASSERT_TRUE(report->Get(expected_audio.id()));
|
| EXPECT_EQ(
|
| report->Get(expected_audio.id())->cast_to<RTCOutboundRTPStreamStats>(),
|
| expected_audio);
|
|
|
| - // Set previously undefined values and "GetStats" again.
|
| - voice_media_info.senders[0].rtt_ms = 4500;
|
| - expected_audio.round_trip_time = 4.5;
|
| -
|
| - EXPECT_CALL(*voice_media_channel, GetStats(_))
|
| - .WillOnce(DoAll(SetArgPointee<0>(voice_media_info), Return(true)));
|
| - collector_->ClearCachedStatsReport();
|
| - report = GetStatsReport();
|
| -
|
| ASSERT_TRUE(report->Get(expected_audio.id()));
|
| EXPECT_EQ(
|
| report->Get(expected_audio.id())->cast_to<RTCOutboundRTPStreamStats>(),
|
| @@ -2029,7 +2018,6 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) {
|
| video_media_info.senders[0].nacks_rcvd = 4;
|
| video_media_info.senders[0].packets_sent = 5;
|
| video_media_info.senders[0].bytes_sent = 6;
|
| - video_media_info.senders[0].rtt_ms = -1;
|
| video_media_info.senders[0].codec_payload_type = rtc::Optional<int>(42);
|
| video_media_info.senders[0].frames_encoded = 8;
|
| video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>();
|
| @@ -2081,8 +2069,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) {
|
| expected_video.packets_sent = 5;
|
| expected_video.bytes_sent = 6;
|
| expected_video.frames_encoded = 8;
|
| - // |expected_video.round_trip_time| and |expected_video.qp_sum| should be
|
| - // undefined.
|
| + // |expected_video.qp_sum| should be undefined.
|
|
|
| ASSERT_TRUE(report->Get(expected_video.id()));
|
| EXPECT_EQ(
|
| @@ -2090,9 +2077,7 @@ TEST_F(RTCStatsCollectorTest, CollectRTCOutboundRTPStreamStats_Video) {
|
| expected_video);
|
|
|
| // Set previously undefined values and "GetStats" again.
|
| - video_media_info.senders[0].rtt_ms = 7500;
|
| video_media_info.senders[0].qp_sum = rtc::Optional<uint64_t>(9);
|
| - expected_video.round_trip_time = 7.5;
|
| expected_video.qp_sum = 9;
|
|
|
| EXPECT_CALL(*video_media_channel, GetStats(_))
|
|
|