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

webrtc/pc/webrtcsession.h

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_PC_WEBRTCSESSION_H_
 #define WEBRTC_PC_WEBRTCSESSION_H_
 
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/statstypes.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/sslidentity.h"
 #include "webrtc/base/thread.h"
-#include "webrtc/media/base/mediachannel.h"
+#include "webrtc/call/call.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/transportcontroller.h"
 #include "webrtc/pc/datachannel.h"
 #include "webrtc/pc/mediasession.h"
 
 #ifdef HAVE_QUIC
 #include "webrtc/pc/quicdatatransport.h"
 #endif  // HAVE_QUIC
 
 namespace cricket {
@@ skipping 250 matching lines @@
   // Implements DataChannelProviderInterface.
   bool SendData(const cricket::SendDataParams& params,
                 const rtc::CopyOnWriteBuffer& payload,
                 cricket::SendDataResult* result) override;
   bool ConnectDataChannel(DataChannel* webrtc_data_channel) override;
   void DisconnectDataChannel(DataChannel* webrtc_data_channel) override;
   void AddSctpDataStream(int sid) override;
   void RemoveSctpDataStream(int sid) override;
   bool ReadyToSendData() const override;
 
+  virtual Call::Stats GetCallStats();
+  Call::Stats GetCallStats_s();

[Taylor Brandstetter, 2017/05/31 00:03:51]

Do both of these need to be public?

+
   // Returns stats for all channels of all transports.
   // This avoids exposing the internal structures used to track them.
   // The parameterless version creates |ChannelNamePairs| from |voice_channel|,
   // |video_channel| and |voice_channel| if available - this requires it to be
   // called on the signaling thread - and invokes the other |GetStats|. The
   // other |GetStats| can be invoked on any thread; if not invoked on the
   // network thread a thread hop will happen.
   std::unique_ptr<SessionStats> GetStats_s();
   virtual std::unique_ptr<SessionStats> GetStats(
       const ChannelNamePairs& channel_name_pairs);
@@ skipping 331 matching lines @@
 
 #ifdef HAVE_QUIC
   std::unique_ptr<QuicDataTransport> quic_data_transport_;
 #endif  // HAVE_QUIC
 
   RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_PC_WEBRTCSESSION_H_