Revert of Wire up BWE stats through WebrtcSession so that they are filled in both for audio and video calls.

webrtc/pc/statscollector_unittest.cc

Index: webrtc/pc/statscollector_unittest.cc
diff --git a/webrtc/pc/statscollector_unittest.cc b/webrtc/pc/statscollector_unittest.cc
index e9a2c5c9d56deddf7dc48b563ce391b0b688a6a8..7d75f6530293857461adcc535e2571d67014b355 100644
--- a/webrtc/pc/statscollector_unittest.cc
+++ b/webrtc/pc/statscollector_unittest.cc
@@ -938,15 +938,12 @@
   video_sender_info.add_ssrc(1234);
   video_sender_info.bytes_sent = kBytesSent;
   stats_read.senders.push_back(video_sender_info);
-
-  webrtc::Call::Stats call_stats;
-  const int kSendBandwidth = 1234567;
-  const int kRecvBandwidth = 12345678;
-  const int kPacerDelay = 123;
-  call_stats.send_bandwidth_bps = kSendBandwidth;
-  call_stats.recv_bandwidth_bps = kRecvBandwidth;
-  call_stats.pacer_delay_ms = kPacerDelay;
-  EXPECT_CALL(session_, GetCallStats()).WillRepeatedly(Return(call_stats));
+  cricket::BandwidthEstimationInfo bwe;
+  const int kTargetEncBitrate = 123456;
+  const std::string kTargetEncBitrateString("123456");
+  bwe.target_enc_bitrate = kTargetEncBitrate;
+  stats_read.bw_estimations.push_back(bwe);
+
   EXPECT_CALL(session_, video_channel()).WillRepeatedly(Return(&video_channel));
   EXPECT_CALL(session_, voice_channel()).WillRepeatedly(ReturnNull());
   EXPECT_CALL(*media_channel, GetStats(_))
@@ -957,15 +954,9 @@
   std::string result = ExtractSsrcStatsValue(reports,
       StatsReport::kStatsValueNameBytesSent);
   EXPECT_EQ(kBytesSentString, result);
-  result = ExtractBweStatsValue(
-      reports, StatsReport::kStatsValueNameAvailableSendBandwidth);
-  EXPECT_EQ(rtc::ToString(kSendBandwidth), result);
-  result = ExtractBweStatsValue(
-      reports, StatsReport::kStatsValueNameAvailableReceiveBandwidth);
-  EXPECT_EQ(rtc::ToString(kRecvBandwidth), result);
-  result =
-      ExtractBweStatsValue(reports, StatsReport::kStatsValueNameBucketDelay);
-  EXPECT_EQ(rtc::ToString(kPacerDelay), result);
+  result = ExtractBweStatsValue(reports,
+      StatsReport::kStatsValueNameTargetEncBitrate);
+  EXPECT_EQ(kTargetEncBitrateString, result);
 }
 
 // This test verifies that an object of type "googSession" always