commit f79ade1320d1f27dc85a1bf7da5ca430ca80ab85
author stefan <stefan@webrtc.org> Fri Jun 02 06:44:03 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Fri Jun 02 13:44:03 2017 +0000
tree cb672ca68c0b7414bf7a482652b678fc0d14c6f3
parent 2047db5f0d864d0e82b69ac325562b9d99bec3cf

Revert "Revert of Wire up BWE stats through WebrtcSession so that they are filled in both for audio and video calls. (patchset #8 id:140001 of https://codereview.webrtc.org/2863123002/ )"

This reverts commit d72098a41971833e210bfdcffaab7a18ced4775f.

BUG=webrtc:5079

Review-Url: https://codereview.webrtc.org/2915263002
Cr-Commit-Position: refs/heads/master@{#18411}

webrtc/pc/rtcstatscollector_unittest.cc

diff --git a/webrtc/pc/rtcstatscollector_unittest.cc b/webrtc/pc/rtcstatscollector_unittest.cc
index 1940da6..7b78632 100644
--- a/webrtc/pc/rtcstatscollector_unittest.cc
+++ b/webrtc/pc/rtcstatscollector_unittest.cc
@@ -1263,9 +1263,6 @@
   // Mock the session to return bandwidth estimation info. These should only
   // be used for a selected candidate pair.
   cricket::VideoMediaInfo video_media_info;
-  video_media_info.bw_estimations.push_back(cricket::BandwidthEstimationInfo());
-  video_media_info.bw_estimations[0].available_send_bandwidth = 8888;
-  video_media_info.bw_estimations[0].available_recv_bandwidth = 9999;
   EXPECT_CALL(*video_media_channel, GetStats(_))
       .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true)));
   EXPECT_CALL(test_->session(), video_channel())
@@ -1345,8 +1342,6 @@
       .channel_stats[0]
       .connection_infos[0]
       .best_connection = true;
-  video_media_info.bw_estimations[0].available_send_bandwidth = 0;
-  video_media_info.bw_estimations[0].available_recv_bandwidth = 0;
   EXPECT_CALL(*video_media_channel, GetStats(_))
       .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true)));
   collector_->ClearCachedStatsReport();
@@ -1360,14 +1355,19 @@
   EXPECT_TRUE(report->Get(*expected_pair.transport_id));
 
   // Set bandwidth and "GetStats" again.
-  video_media_info.bw_estimations[0].available_send_bandwidth = 888;
-  video_media_info.bw_estimations[0].available_recv_bandwidth = 999;
+  webrtc::Call::Stats call_stats;
+  const int kSendBandwidth = 888;
+  call_stats.send_bandwidth_bps = kSendBandwidth;
+  const int kRecvBandwidth = 999;
+  call_stats.recv_bandwidth_bps = kRecvBandwidth;
+  EXPECT_CALL(test_->session(), GetCallStats())
+      .WillRepeatedly(Return(call_stats));
   EXPECT_CALL(*video_media_channel, GetStats(_))
       .WillOnce(DoAll(SetArgPointee<0>(video_media_info), Return(true)));
   collector_->ClearCachedStatsReport();
   report = GetStatsReport();
-  expected_pair.available_outgoing_bitrate = 888;
-  expected_pair.available_incoming_bitrate = 999;
+  expected_pair.available_outgoing_bitrate = kSendBandwidth;
+  expected_pair.available_incoming_bitrate = kRecvBandwidth;
   ASSERT_TRUE(report->Get(expected_pair.id()));
   EXPECT_EQ(
       expected_pair,