Modify PeerConnection for end-to-end QuicDataChannel usage

webrtc/api/webrtcsdp_unittest.cc

 /*
  *  Copyright 2011 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.
  */
 
@@ skipping 1198 matching lines @@
       } else {
         EXPECT_EQ(transport1.description.identity_fingerprint.get(),
                   transport2.description.identity_fingerprint.get());
       }
       EXPECT_EQ(transport1.description.transport_options,
                 transport2.description.transport_options);
     }
 
     // global attributes
     EXPECT_EQ(desc1.msid_supported(), desc2.msid_supported());
+    EXPECT_EQ(desc1.quic(), desc2.quic());
   }
 
   bool CompareSessionDescription(
       const JsepSessionDescription& desc1,
       const JsepSessionDescription& desc2) {
     EXPECT_EQ(desc1.session_id(), desc2.session_id());
     EXPECT_EQ(desc1.session_version(), desc2.session_version());
     CompareSessionDescription(*desc1.description(), *desc2.description());
     if (desc1.number_of_mediasections() != desc2.number_of_mediasections())
       return false;
@@ skipping 1883 matching lines @@
   EXPECT_TRUE(
       SdpDeserialize(kUnifiedPlanSdpFullString, &deserialized_description));
 
   EXPECT_TRUE(CompareSessionDescription(jdesc_, deserialized_description));
 }
 
 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());
+}