Accept SDP with TRANSPORT attributes missing from bundled m= sections.

webrtc/p2p/base/transportdescriptionfactory_unittest.cc

 /*
  *  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.
  */
 
@@ skipping 46 matching lines @@
   // This test ice restart by doing two offer answer exchanges. On the second
   // exchange ice is restarted. The test verifies that the ufrag and password
   // in the offer and answer is changed.
   // If |dtls| is true, the test verifies that the finger print is not changed.
   void TestIceRestart(bool dtls) {
     SetDtls(dtls);
     cricket::TransportOptions options;
     // The initial offer / answer exchange.
     std::unique_ptr<TransportDescription> offer(f1_.CreateOffer(options, NULL));
     std::unique_ptr<TransportDescription> answer(
-        f2_.CreateAnswer(offer.get(), options, NULL));
+        f2_.CreateAnswer(offer.get(), options, NULL, false));
 
     // Create an updated offer where we restart ice.
     options.ice_restart = true;
     std::unique_ptr<TransportDescription> restart_offer(
         f1_.CreateOffer(options, offer.get()));
 
     VerifyUfragAndPasswordChanged(dtls, offer.get(), restart_offer.get());
 
     // Create a new answer. The transport ufrag and password is changed since
     // |options.ice_restart == true|
     std::unique_ptr<TransportDescription> restart_answer(
-        f2_.CreateAnswer(restart_offer.get(), options, answer.get()));
+        f2_.CreateAnswer(restart_offer.get(), options, answer.get(), false));
     ASSERT_TRUE(restart_answer.get() != NULL);
 
     VerifyUfragAndPasswordChanged(dtls, answer.get(), restart_answer.get());
   }
 
   void VerifyUfragAndPasswordChanged(bool dtls,
                                      const TransportDescription* org_desc,
                                      const TransportDescription* restart_desc) {
     EXPECT_NE(org_desc->ice_pwd, restart_desc->ice_pwd);
     EXPECT_NE(org_desc->ice_ufrag, restart_desc->ice_ufrag);
@@ skipping 11 matching lines @@
   }
 
   void TestIceRenomination(bool dtls) {
     SetDtls(dtls);
 
     cricket::TransportOptions options;
     // The initial offer / answer exchange.
     std::unique_ptr<TransportDescription> offer(
         f1_.CreateOffer(options, nullptr));
     std::unique_ptr<TransportDescription> answer(
-        f2_.CreateAnswer(offer.get(), options, nullptr));
+        f2_.CreateAnswer(offer.get(), options, nullptr, false));
     VerifyRenomination(offer.get(), false);
     VerifyRenomination(answer.get(), false);
 
     options.enable_ice_renomination = true;
     std::unique_ptr<TransportDescription> renomination_offer(
         f1_.CreateOffer(options, offer.get()));
     VerifyRenomination(renomination_offer.get(), true);
 
-    std::unique_ptr<TransportDescription> renomination_answer(
-        f2_.CreateAnswer(renomination_offer.get(), options, answer.get()));
+    std::unique_ptr<TransportDescription> renomination_answer(f2_.CreateAnswer(
+        renomination_offer.get(), options, answer.get(), false));
     VerifyRenomination(renomination_answer.get(), true);
   }
 
  protected:
   void VerifyRenomination(TransportDescription* desc,
                           bool renomination_expected) {
     ASSERT_TRUE(desc != nullptr);
     std::vector<std::string>& options = desc->transport_options;
     auto iter = std::find(options.begin(), options.end(),
                           cricket::ICE_RENOMINATION_STR);
@@ skipping 63 matching lines @@
       f1_.CreateOffer(TransportOptions(), old_desc.get()));
   CheckDesc(desc.get(), "",
             old_desc->ice_ufrag, old_desc->ice_pwd, digest_alg);
 }
 
 TEST_F(TransportDescriptionFactoryTest, TestAnswerDefault) {
   std::unique_ptr<TransportDescription> offer(
       f1_.CreateOffer(TransportOptions(), NULL));
   ASSERT_TRUE(offer.get() != NULL);
   std::unique_ptr<TransportDescription> desc(
-      f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+      f2_.CreateAnswer(offer.get(), TransportOptions(), NULL, false));
   CheckDesc(desc.get(), "", "", "", "");
-  desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(),
-                              NULL));
+  desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(), NULL, false));
   CheckDesc(desc.get(), "", "", "", "");
 }
 
 // Test that we can update an answer properly; ICE credentials shouldn't change.
 TEST_F(TransportDescriptionFactoryTest, TestReanswer) {
   std::unique_ptr<TransportDescription> offer(
       f1_.CreateOffer(TransportOptions(), NULL));
   ASSERT_TRUE(offer.get() != NULL);
   std::unique_ptr<TransportDescription> old_desc(
-      f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+      f2_.CreateAnswer(offer.get(), TransportOptions(), NULL, false));
   ASSERT_TRUE(old_desc.get() != NULL);
   std::unique_ptr<TransportDescription> desc(
-      f2_.CreateAnswer(offer.get(), TransportOptions(), old_desc.get()));
+      f2_.CreateAnswer(offer.get(), TransportOptions(), old_desc.get(), false));
   ASSERT_TRUE(desc.get() != NULL);
   CheckDesc(desc.get(), "",
             old_desc->ice_ufrag, old_desc->ice_pwd, "");
 }
 
 // Test that we handle answering an offer with DTLS with no DTLS.
 TEST_F(TransportDescriptionFactoryTest, TestAnswerDtlsToNoDtls) {
   f1_.set_secure(cricket::SEC_ENABLED);
   f1_.set_certificate(cert1_);
   std::unique_ptr<TransportDescription> offer(
       f1_.CreateOffer(TransportOptions(), NULL));
   ASSERT_TRUE(offer.get() != NULL);
   std::unique_ptr<TransportDescription> desc(
-      f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+      f2_.CreateAnswer(offer.get(), TransportOptions(), NULL, false));
   CheckDesc(desc.get(), "", "", "", "");
 }
 
 // Test that we handle answering an offer without DTLS if we have DTLS enabled,
 // but fail if we require DTLS.
 TEST_F(TransportDescriptionFactoryTest, TestAnswerNoDtlsToDtls) {
   f2_.set_secure(cricket::SEC_ENABLED);
   f2_.set_certificate(cert2_);
   std::unique_ptr<TransportDescription> offer(
       f1_.CreateOffer(TransportOptions(), NULL));
   ASSERT_TRUE(offer.get() != NULL);
   std::unique_ptr<TransportDescription> desc(
-      f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+      f2_.CreateAnswer(offer.get(), TransportOptions(), NULL, false));
   CheckDesc(desc.get(), "", "", "", "");
   f2_.set_secure(cricket::SEC_REQUIRED);
-  desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(),
-                              NULL));
+  desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(), NULL, false));
   ASSERT_TRUE(desc.get() == NULL);
 }
 
 // Test that we handle answering an DTLS offer with DTLS, both if we have
 // DTLS enabled and required.
 TEST_F(TransportDescriptionFactoryTest, TestAnswerDtlsToDtls) {
   f1_.set_secure(cricket::SEC_ENABLED);
   f1_.set_certificate(cert1_);
 
   f2_.set_secure(cricket::SEC_ENABLED);
   f2_.set_certificate(cert2_);
   // f2_ produces the answer that is being checked in this test, so the
   // answer must contain fingerprint lines with cert2_'s digest algorithm.
   std::string digest_alg2;
   ASSERT_TRUE(cert2_->ssl_certificate().GetSignatureDigestAlgorithm(
       &digest_alg2));
 
   std::unique_ptr<TransportDescription> offer(
       f1_.CreateOffer(TransportOptions(), NULL));
   ASSERT_TRUE(offer.get() != NULL);
   std::unique_ptr<TransportDescription> desc(
-      f2_.CreateAnswer(offer.get(), TransportOptions(), NULL));
+      f2_.CreateAnswer(offer.get(), TransportOptions(), NULL, false));
   CheckDesc(desc.get(), "", "", "", digest_alg2);
   f2_.set_secure(cricket::SEC_REQUIRED);
-  desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(),
-                              NULL));
+  desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(), NULL, false));
   CheckDesc(desc.get(), "", "", "", digest_alg2);
 }
 
 // Test that ice ufrag and password is changed in an updated offer and answer
 // if |TransportDescriptionOptions::ice_restart| is true.
 TEST_F(TransportDescriptionFactoryTest, TestIceRestart) {
   TestIceRestart(false);
 }
 
 // Test that ice ufrag and password is changed in an updated offer and answer
 // if |TransportDescriptionOptions::ice_restart| is true and DTLS is enabled.
 TEST_F(TransportDescriptionFactoryTest, TestIceRestartWithDtls) {
   TestIceRestart(true);
 }
 
 // Test that ice renomination is set in an updated offer and answer
 // if |TransportDescriptionOptions::enable_ice_renomination| is true.
 TEST_F(TransportDescriptionFactoryTest, TestIceRenomination) {
   TestIceRenomination(false);
 }
 
 // Test that ice renomination is set in an updated offer and answer
 // if |TransportDescriptionOptions::enable_ice_renomination| is true and DTLS
 // is enabled.
 TEST_F(TransportDescriptionFactoryTest, TestIceRenominationWithDtls) {
   TestIceRenomination(true);
 }