Modify PeerConnection for end-to-end QuicDataChannel usage

webrtc/p2p/base/transportcontroller.h

Index: webrtc/p2p/base/transportcontroller.h
diff --git a/webrtc/p2p/base/transportcontroller.h b/webrtc/p2p/base/transportcontroller.h
index ed7216033b429d91625fd16a3c86d3a55cf9722f..bb47656f5063e220a84cc0c24f374e943bd92aeb 100644
--- a/webrtc/p2p/base/transportcontroller.h
+++ b/webrtc/p2p/base/transportcontroller.h
@@ -27,6 +27,9 @@ class Thread;
 
 namespace cricket {
 
+class P2PTransportChannel;
+class QuicTransportChannel;
+
 class TransportController : public sigslot::has_slots<>,
                             public rtc::MessageHandler {
  public:
@@ -89,6 +92,11 @@ class TransportController : public sigslot::has_slots<>,
   // nothing is referencing it.
   virtual void DestroyTransportChannel_w(const std::string& transport_name,
                                          int component);
+  // Activates QUIC usage instead of DTLS if |use_quic| is true and the USE_QUIC
+  // macro is defined.

[pthatcher1, 2016/03/30 20:34:50]

Just say "if USE_QUIC is defined"

[mikescarlett, 2016/04/05 19:58:53]

I made this simpler by putting it behind HAVE_QUIC and setting "quic_ = true"
instead of having a use_quic parameter

+  void set_quic(bool use_quic);
+  bool quic() const { return quic_; }
+  QuicTransportChannel* quic_transport_channel() const;

[pthatcher1, 2016/03/30 20:34:50]

Doesn't this need to be behind USE_QUIC?

[mikescarlett, 2016/04/05 19:58:53]

Yes. Done. (Also removed quic_transport_channel() method)

 
   // All of these signals are fired on the signalling thread.
 
@@ -221,6 +229,15 @@ class TransportController : public sigslot::has_slots<>,
   uint64_t ice_tiebreaker_ = rtc::CreateRandomId64();
   rtc::scoped_refptr<rtc::RTCCertificate> certificate_;
   rtc::AsyncInvoker invoker_;
+
+  // True if QUIC is used instead of DTLS.
+  bool quic_ = false;
+#ifdef USE_QUIC
+  rtc::scoped_ptr<P2PTransportChannel> ice_transport_channel_;
+  // Owned by TransportController. This is not a scoped_ptr because its pointer
+  // is added to |transports_|.
+  QuicTransportChannel* quic_transport_channel_ = nullptr;
+#endif  // USE_QUIC
 };
 
 }  // namespace cricket