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

webrtc/api/webrtcsession_unittest.cc

Index: webrtc/api/webrtcsession_unittest.cc
diff --git a/webrtc/api/webrtcsession_unittest.cc b/webrtc/api/webrtcsession_unittest.cc
index 1aff50f1cad6b90a60f803e8b852a46b95df5c7a..c0d8a3bbdfe17ee7a11cbeab172e16aae0d56851 100644
--- a/webrtc/api/webrtcsession_unittest.cc
+++ b/webrtc/api/webrtcsession_unittest.cc
@@ -558,6 +558,8 @@ class WebRtcSessionTest
 
     if (session_->data_channel_type() == cricket::DCT_SCTP && data_channel_) {
       session_options->data_channel_type = cricket::DCT_SCTP;
+    } else if (session_->data_channel_type() == cricket::DCT_QUIC) {
+      session_options->data_channel_type = cricket::DCT_QUIC;
     }
 
     if (with_gcm_) {
@@ -575,8 +577,8 @@ class WebRtcSessionTest
         (session_options->has_audio() || session_options->has_video() ||
          session_options->has_data());
 
-    if (session_->data_channel_type() == cricket::DCT_SCTP) {
-      session_options->data_channel_type = cricket::DCT_SCTP;
+    if (session_->data_channel_type() != cricket::DCT_RTP) {
+      session_options->data_channel_type = session_->data_channel_type();
     }
 
     if (with_gcm_) {
@@ -4212,6 +4214,26 @@ TEST_P(WebRtcSessionTest, TestRenegotiateNewMediaWithCandidatesSeparated) {
   SetLocalDescriptionWithoutError(answer);
 }
 
+#ifdef HAVE_QUIC
+TEST_P(WebRtcSessionTest, TestNegotiateQuic) {
+  configuration_.enable_quic = true;
+  InitWithDtls(GetParam());
+  EXPECT_TRUE(session_->data_channel_type() == cricket::DCT_QUIC);
+  SessionDescriptionInterface* offer = CreateOffer();
+  ASSERT_TRUE(offer);
+  ASSERT_TRUE(offer->description());
+  SetLocalDescriptionWithoutError(offer);
+  cricket::MediaSessionOptions options;
+  options.recv_audio = true;
+  options.recv_video = true;
+  SessionDescriptionInterface* answer =
+      CreateRemoteAnswer(offer, options, cricket::SEC_DISABLED);
+  ASSERT_TRUE(answer);
+  ASSERT_TRUE(answer->description());
+  SetRemoteDescriptionWithoutError(answer);
+}
+#endif  // HAVE_QUIC
+
 // Tests that RTX codec is removed from the answer when it isn't supported
 // by local side.
 TEST_F(WebRtcSessionTest, TestRtxRemovedByCreateAnswer) {