Relax parsing of a=bundle-only with a nonzero port.

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 3221 matching lines @@
     }
 
     std::string serialized_sdp = webrtc::SdpSerialize(jdesc, false);
     EXPECT_EQ(sdp_string, serialized_sdp);
   }
 }
 
 TEST_F(WebRtcSdpTest, DeserializeBundleOnlyAttribute) {
   MakeBundleOnlyDescription();
   JsepSessionDescription deserialized_description(kDummyString);
-  EXPECT_TRUE(
+  ASSERT_TRUE(
       SdpDeserialize(kBundleOnlySdpFullString, &deserialized_description));
   EXPECT_TRUE(CompareSessionDescription(jdesc_, deserialized_description));
 }
 
-// "a=bundle-only" should only be used in combination with a 0 port on the m=
-// line. We should fail to parse anything else.
-TEST_F(WebRtcSdpTest, FailToDeserializeBundleOnlyWithNonzeroPort) {
-  std::string bad_sdp = kBundleOnlySdpFullString;
-  Replace("m=video 0", "m=video 9", &bad_sdp);
-  ExpectParseFailure(bad_sdp, "a=bundle-only");
+// The semantics of "a=bundle-only" are only defined when it's used in
+// combination with a 0 port on the m= line. We should ignore it if used with a
+// nonzero port.
+TEST_F(WebRtcSdpTest, IgnoreBundleOnlyWithNonzeroPort) {
+  // Make the base bundle-only description but unset the bundle-only flag.
+  MakeBundleOnlyDescription();
+  jdesc_.description()->contents()[1].bundle_only = false;
+
+  std::string modified_sdp = kBundleOnlySdpFullString;
+  Replace("m=video 0", "m=video 9", &modified_sdp);
+  JsepSessionDescription deserialized_description(kDummyString);
+  ASSERT_TRUE(SdpDeserialize(modified_sdp, &deserialized_description));
+  EXPECT_TRUE(CompareSessionDescription(jdesc_, deserialized_description));
 }
 
 TEST_F(WebRtcSdpTest, SerializeBundleOnlyAttribute) {
   MakeBundleOnlyDescription();
   TestSerialize(jdesc_, false);
 }
 
 TEST_F(WebRtcSdpTest, DeserializePlanBSessionDescription) {
   MakePlanBDescription();
 
@@ skipping 68 matching lines @@
       "v=0\r\n"
       "o=- 18446744069414584320 18446462598732840960 IN IP4 127.0.0.1\r\n"
       "s=-\r\n"
       "t=0 0\r\n"
       "m=video 3457 RTP/SAVPF 120\r\n"
       "b=AS:2147483647\r\n"
       "foo=fail\r\n";
 
   ExpectParseFailure(std::string(kSdpWithLargeBandwidth), "foo=fail");
 }