Modify PeerConnection for end-to-end QuicDataChannel usage

webrtc/api/webrtcsdp_unittest.cc

Index: webrtc/api/webrtcsdp_unittest.cc
diff --git a/webrtc/api/webrtcsdp_unittest.cc b/webrtc/api/webrtcsdp_unittest.cc
index c52720453b7021042760dabc688efd5768dc94fd..c45b0ecc398ca80bcd5423f2dbda3b9c37ce1abc 100644
--- a/webrtc/api/webrtcsdp_unittest.cc
+++ b/webrtc/api/webrtcsdp_unittest.cc
@@ -1216,6 +1216,7 @@ class WebRtcSdpTest : public testing::Test {
 
     // global attributes
     EXPECT_EQ(desc1.msid_supported(), desc2.msid_supported());
+    EXPECT_EQ(desc1.quic(), desc2.quic());
   }
 
   bool CompareSessionDescription(
@@ -3119,3 +3120,33 @@ TEST_F(WebRtcSdpTest, SerializeUnifiedPlanSessionDescription) {
   MakeUnifiedPlanDescription();
   TestSerialize(jdesc_, true);
 }
+
+TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithQuic) {
+  JsepSessionDescription jsep_desc(kDummyString);
+  ASSERT_TRUE(jsep_desc.Initialize(desc_.Copy(), kSessionId, kSessionVersion));
+  jsep_desc.description()->set_quic(true);
+  std::string message = webrtc::SdpSerialize(jsep_desc, false);
+  EXPECT_NE(message.find("a=quic\r\n"), std::string::npos);
+}
+
+TEST_F(WebRtcSdpTest, SerializeSessionDescriptionWithoutQuic) {
+  JsepSessionDescription jsep_desc(kDummyString);
+  ASSERT_TRUE(jsep_desc.Initialize(desc_.Copy(), kSessionId, kSessionVersion));
+  std::string message = webrtc::SdpSerialize(jsep_desc, false);
+  EXPECT_EQ(message.find("a=quic\r\n"), std::string::npos);
+}
+
+TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithQuic) {
+  std::string sdp_with_quic = kSdpSessionString;
+  InjectAfter(kSessionTime, "a=quic\r\n", &sdp_with_quic);
+  JsepSessionDescription jsep_desc_output(kDummyString);
+  EXPECT_TRUE(SdpDeserialize(sdp_with_quic, &jsep_desc_output));
+  EXPECT_TRUE(jsep_desc_output.description()->quic());
+}
+
+TEST_F(WebRtcSdpTest, DeserializeSessionDescriptionWithoutQuic) {

[Taylor Brandstetter, 2016/04/01 23:23:42]

Aren't the "WithoutQuic" tests already covered by the tests above, since the
sample session description doesn't contain "a=quic"?

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

They are. You're correct.

+  std::string sdp_with_quic = kSdpSessionString;

[Taylor Brandstetter, 2016/04/01 23:23:42]

Should be sdp_without_quic?

+  JsepSessionDescription jsep_desc_output(kDummyString);
+  EXPECT_TRUE(SdpDeserialize(sdp_with_quic, &jsep_desc_output));
+  EXPECT_FALSE(jsep_desc_output.description()->quic());
+}