| Index: webrtc/p2p/base/transportdescriptionfactory_unittest.cc
 | 
| diff --git a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
 | 
| index 14be338a0ba1b96dbb37f4cdd854642fe7a26b5b..195ccd239bdfc24bed670e36db310edc6e545b40 100644
 | 
| --- a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
 | 
| +++ b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
 | 
| @@ -64,7 +64,7 @@ class TransportDescriptionFactoryTest : public testing::Test {
 | 
|      // 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, true, NULL));
 | 
|  
 | 
|      // Create an updated offer where we restart ice.
 | 
|      options.ice_restart = true;
 | 
| @@ -76,7 +76,7 @@ class TransportDescriptionFactoryTest : public testing::Test {
 | 
|      // 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, true, answer.get()));
 | 
|      ASSERT_TRUE(restart_answer.get() != NULL);
 | 
|  
 | 
|      VerifyUfragAndPasswordChanged(dtls, answer.get(), restart_answer.get());
 | 
| @@ -108,7 +108,7 @@ class TransportDescriptionFactoryTest : public testing::Test {
 | 
|      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, true, nullptr));
 | 
|      VerifyRenomination(offer.get(), false);
 | 
|      VerifyRenomination(answer.get(), false);
 | 
|  
 | 
| @@ -117,8 +117,8 @@ class TransportDescriptionFactoryTest : public testing::Test {
 | 
|          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, true, answer.get()));
 | 
|      VerifyRenomination(renomination_answer.get(), true);
 | 
|    }
 | 
|  
 | 
| @@ -202,10 +202,9 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerDefault) {
 | 
|        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(), true, NULL));
 | 
|    CheckDesc(desc.get(), "", "", "", "");
 | 
| -  desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(),
 | 
| -                              NULL));
 | 
| +  desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(), true, NULL));
 | 
|    CheckDesc(desc.get(), "", "", "", "");
 | 
|  }
 | 
|  
 | 
| @@ -215,10 +214,10 @@ TEST_F(TransportDescriptionFactoryTest, TestReanswer) {
 | 
|        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(), true, NULL));
 | 
|    ASSERT_TRUE(old_desc.get() != NULL);
 | 
|    std::unique_ptr<TransportDescription> desc(
 | 
| -      f2_.CreateAnswer(offer.get(), TransportOptions(), old_desc.get()));
 | 
| +      f2_.CreateAnswer(offer.get(), TransportOptions(), true, old_desc.get()));
 | 
|    ASSERT_TRUE(desc.get() != NULL);
 | 
|    CheckDesc(desc.get(), "",
 | 
|              old_desc->ice_ufrag, old_desc->ice_pwd, "");
 | 
| @@ -232,7 +231,7 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerDtlsToNoDtls) {
 | 
|        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(), true, NULL));
 | 
|    CheckDesc(desc.get(), "", "", "", "");
 | 
|  }
 | 
|  
 | 
| @@ -245,11 +244,10 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerNoDtlsToDtls) {
 | 
|        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(), true, NULL));
 | 
|    CheckDesc(desc.get(), "", "", "", "");
 | 
|    f2_.set_secure(cricket::SEC_REQUIRED);
 | 
| -  desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(),
 | 
| -                              NULL));
 | 
| +  desc.reset(f2_.CreateAnswer(offer.get(), TransportOptions(), true, NULL));
 | 
|    ASSERT_TRUE(desc.get() == NULL);
 | 
|  }
 | 
|  
 | 
| @@ -271,11 +269,10 @@ TEST_F(TransportDescriptionFactoryTest, TestAnswerDtlsToDtls) {
 | 
|        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(), true, NULL));
 | 
|    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(), true, NULL));
 | 
|    CheckDesc(desc.get(), "", "", "", digest_alg2);
 | 
|  }
 | 
|  
 | 
| 
 |