Add "ice-option:trickle" to generated offers/answers.

webrtc/p2p/base/transportdescriptionfactory.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 19 matching lines @@
   std::unique_ptr<TransportDescription> desc(new TransportDescription());
 
   // Generate the ICE credentials if we don't already have them.
   if (!current_description || options.ice_restart) {
     desc->ice_ufrag = rtc::CreateRandomString(ICE_UFRAG_LENGTH);
     desc->ice_pwd = rtc::CreateRandomString(ICE_PWD_LENGTH);
   } else {
     desc->ice_ufrag = current_description->ice_ufrag;
     desc->ice_pwd = current_description->ice_pwd;
   }
+  desc->AddOption(ICE_OPTION_TRICKLE);
   if (options.enable_ice_renomination) {
-    desc->AddOption(ICE_RENOMINATION_STR);
+    desc->AddOption(ICE_OPTION_RENOMINATION);
   }
 
   // If we are trying to establish a secure transport, add a fingerprint.
   if (secure_ == SEC_ENABLED || secure_ == SEC_REQUIRED) {
     // Fail if we can't create the fingerprint.
     // If we are the initiator set role to "actpass".
     if (!SetSecurityInfo(desc.get(), CONNECTIONROLE_ACTPASS)) {
       return NULL;
     }
   }
@@ skipping 16 matching lines @@
   std::unique_ptr<TransportDescription> desc(new TransportDescription());
   // Generate the ICE credentials if we don't already have them or ice is
   // being restarted.
   if (!current_description || options.ice_restart) {
     desc->ice_ufrag = rtc::CreateRandomString(ICE_UFRAG_LENGTH);
     desc->ice_pwd = rtc::CreateRandomString(ICE_PWD_LENGTH);
   } else {
     desc->ice_ufrag = current_description->ice_ufrag;
     desc->ice_pwd = current_description->ice_pwd;
   }
+  desc->AddOption(ICE_OPTION_TRICKLE);
   if (options.enable_ice_renomination) {
-    desc->AddOption(ICE_RENOMINATION_STR);
+    desc->AddOption(ICE_OPTION_RENOMINATION);
   }
 
   // Negotiate security params.
   if (offer && offer->identity_fingerprint.get()) {
     // The offer supports DTLS, so answer with DTLS, as long as we support it.
     if (secure_ == SEC_ENABLED || secure_ == SEC_REQUIRED) {
       // Fail if we can't create the fingerprint.
       // Setting DTLS role to active.
       ConnectionRole role = (options.prefer_passive_role) ?
           CONNECTIONROLE_PASSIVE : CONNECTIONROLE_ACTIVE;
@@ skipping 41 matching lines @@
                   << digest_alg;
     return false;
   }
 
   // Assign security role.
   desc->connection_role = role;
   return true;
 }
 
 }  // namespace cricket