Revert "Revert of Wire up BWE stats through WebrtcSession so that they are filled in both for audio…

webrtc/pc/rtcstatscollector.h

Index: webrtc/pc/rtcstatscollector.h
diff --git a/webrtc/pc/rtcstatscollector.h b/webrtc/pc/rtcstatscollector.h
index 48e66baf7eaf2222d5d59cc478cc46f0be34bfad..9dce0fe79e668e8150b7fb770536b0a83368c4bd 100644
--- a/webrtc/pc/rtcstatscollector.h
+++ b/webrtc/pc/rtcstatscollector.h
@@ -26,6 +26,7 @@
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sslidentity.h"
 #include "webrtc/base/timeutils.h"
+#include "webrtc/call/call.h"
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/pc/datachannel.h"
 #include "webrtc/pc/trackmediainfomap.h"
@@ -104,8 +105,10 @@ class RTCStatsCollector : public virtual rtc::RefCountInterface,
       int64_t timestamp_us, RTCStatsReport* report) const;
   // Produces |RTCIceCandidatePairStats| and |RTCIceCandidateStats|.
   void ProduceIceCandidateAndPairStats_n(
-      int64_t timestamp_us, const SessionStats& session_stats,
+      int64_t timestamp_us,
+      const SessionStats& session_stats,
       const cricket::VideoMediaInfo* video_media_info,
+      const Call::Stats& call_stats,
       RTCStatsReport* report) const;
   // Produces |RTCMediaStreamStats| and |RTCMediaStreamTrackStats|.
   void ProduceMediaStreamAndTrackStats_s(
@@ -154,6 +157,7 @@ class RTCStatsCollector : public virtual rtc::RefCountInterface,
   std::unique_ptr<ChannelNamePairs> channel_name_pairs_;
   std::unique_ptr<TrackMediaInfoMap> track_media_info_map_;
   std::map<MediaStreamTrackInterface*, std::string> track_to_id_;
+  Call::Stats call_stats_;
 
   // A timestamp, in microseconds, that is based on a timer that is
   // monotonically increasing. That is, even if the system clock is modified the