Modify PeerConnection for end-to-end QuicDataChannel usage

webrtc/api/peerconnection.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_API_PEERCONNECTION_H_
 #define WEBRTC_API_PEERCONNECTION_H_
 
 #include <string>
 #include <map>
 #include <vector>
 
 #include "webrtc/api/dtlsidentitystore.h"
 #include "webrtc/api/peerconnectionfactory.h"
 #include "webrtc/api/peerconnectioninterface.h"
 #include "webrtc/api/rtpreceiverinterface.h"
 #include "webrtc/api/rtpsenderinterface.h"
 #include "webrtc/api/statscollector.h"
 #include "webrtc/api/streamcollection.h"
 #include "webrtc/api/webrtcsession.h"
 #include "webrtc/base/scoped_ptr.h"
 
+#ifdef USE_QUIC

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

I think our naming convention is HAVE_QUIC, but I could be wrong.

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

I renamed it HAVE_QUIC because HAVE_SCTP is used for building SCTP.

+#include "webrtc/api/quicdatachannel.h"
+#include "webrtc/api/quictransport.h"
+#endif  // USE_QUIC
+
 namespace webrtc {
 
 class MediaStreamObserver;
 class VideoRtpReceiver;
 
 // Populates |session_options| from |rtc_options|, and returns true if options
 // are valid.
 // |session_options|->transport_options map entries must exist in order for
 // them to be populated from |rtc_options|.
 bool ExtractMediaSessionOptions(
@@ skipping 342 matching lines @@
   TrackInfos remote_audio_tracks_;
   TrackInfos remote_video_tracks_;
   TrackInfos local_audio_tracks_;
   TrackInfos local_video_tracks_;
 
   SctpSidAllocator sid_allocator_;
   // label -> DataChannel
   std::map<std::string, rtc::scoped_refptr<DataChannel>> rtp_data_channels_;
   std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_;
   std::vector<rtc::scoped_refptr<DataChannel>> sctp_data_channels_to_free_;
+#ifdef USE_QUIC
+  std::vector<rtc::scoped_refptr<QuicDataChannel>> quic_data_channels_;
+  rtc::scoped_ptr<QuicTransport> quic_transport_;
+#endif  // USE_QUIC
 
   bool remote_peer_supports_msid_ = false;
 
   std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_;
   std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_;
 
   // The session_ scoped_ptr is declared at the bottom of PeerConnection
   // because its destruction fires signals (such as VoiceChannelDestroyed)
   // which will trigger some final actions in PeerConnection...
   rtc::scoped_ptr<WebRtcSession> session_;
   // ... But stats_ depends on session_ so it should be destroyed even earlier.
   rtc::scoped_ptr<StatsCollector> stats_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_PEERCONNECTION_H_