Modified PeerConnection and WebRtcSession for end-to-end QuicDataChannel usage.

webrtc/api/webrtcsession.h

Index: webrtc/api/webrtcsession.h
diff --git a/webrtc/api/webrtcsession.h b/webrtc/api/webrtcsession.h
index d69abc0dedb67097ba6c56c0f1f019e950e53504..87408c8ab5d614bad5feb8d69f549de9c78e5508 100644
--- a/webrtc/api/webrtcsession.h
+++ b/webrtc/api/webrtcsession.h
@@ -30,6 +30,10 @@
 #include "webrtc/p2p/base/transportcontroller.h"
 #include "webrtc/pc/mediasession.h"
 
+#ifdef HAVE_QUIC
+#include "webrtc/api/quicdatatransport.h"
+#endif  // HAVE_QUIC
+
 namespace cricket {
 
 class ChannelManager;
@@ -38,6 +42,10 @@ class StatsReport;
 class VideoChannel;
 class VoiceChannel;
 
+#ifdef HAVE_QUIC
+class QuicTransportChannel;
+#endif  // HAVE_QUIC
+
 }  // namespace cricket
 
 namespace webrtc {
@@ -144,6 +152,7 @@ class WebRtcSession :
   virtual ~WebRtcSession();
 
   // These are const to allow them to be called from const methods.
+  rtc::Thread* network_thread() const { return network_thread_; }
   rtc::Thread* worker_thread() const { return worker_thread_; }
   rtc::Thread* signaling_thread() const { return signaling_thread_; }
 
@@ -299,6 +308,11 @@ class WebRtcSession :
   // std::string represents the data channel label.
   sigslot::signal2<const std::string&, const InternalDataChannelInit&>
       SignalDataChannelOpenMessage;
+#ifdef HAVE_QUIC
+  QuicDataTransport* quic_data_transport() {
+    return quic_data_transport_.get();
+  }
+#endif  // HAVE_QUIC
 
  private:
   // Indicates the type of SessionDescription in a call to SetLocalDescription
@@ -443,6 +457,7 @@ class WebRtcSession :
 
   void OnSentPacket_w(const rtc::SentPacket& sent_packet);
 
+  rtc::Thread* const network_thread_;
   rtc::Thread* const worker_thread_;
   rtc::Thread* const signaling_thread_;
 
@@ -494,6 +509,11 @@ class WebRtcSession :
   bool received_first_video_packet_ = false;
   bool received_first_audio_packet_ = false;
 
+#ifdef HAVE_QUIC
+  cricket::QuicTransportChannel* quic_transport_channel_ = nullptr;
+  std::unique_ptr<QuicDataTransport> quic_data_transport_;
+#endif  // HAVE_QUIC
+
   RTC_DISALLOW_COPY_AND_ASSIGN(WebRtcSession);
 };
 }  // namespace webrtc