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

webrtc/p2p/base/transportdescription.h

 /*
  *  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 69 matching lines @@
            renomination == other.renomination;
   }
   bool operator!=(const IceParameters& other) { return !(*this == other); }
 };
 
 extern const char CONNECTIONROLE_ACTIVE_STR[];
 extern const char CONNECTIONROLE_PASSIVE_STR[];
 extern const char CONNECTIONROLE_ACTPASS_STR[];
 extern const char CONNECTIONROLE_HOLDCONN_STR[];
 
-constexpr auto ICE_RENOMINATION_STR = "renomination";
+constexpr auto ICE_OPTION_TRICKLE = "trickle";
+constexpr auto ICE_OPTION_RENOMINATION = "renomination";
 
 bool StringToConnectionRole(const std::string& role_str, ConnectionRole* role);
 bool ConnectionRoleToString(const ConnectionRole& role, std::string* role_str);
 
 struct TransportDescription {
   TransportDescription()
       : ice_mode(ICEMODE_FULL),
         connection_role(CONNECTIONROLE_NONE) {}
 
   TransportDescription(const std::vector<std::string>& transport_options,
@@ skipping 32 matching lines @@
     ice_ufrag = from.ice_ufrag;
     ice_pwd = from.ice_pwd;
     ice_mode = from.ice_mode;
     connection_role = from.connection_role;
 
     identity_fingerprint.reset(CopyFingerprint(
         from.identity_fingerprint.get()));
     return *this;
   }
 
+  // TODO(deadbeef): Rename to HasIceOption, etc.
   bool HasOption(const std::string& option) const {
     return (std::find(transport_options.begin(), transport_options.end(),
                       option) != transport_options.end());
   }
   void AddOption(const std::string& option) {
     transport_options.push_back(option);
   }
   bool secure() const { return identity_fingerprint != nullptr; }
 
   IceParameters GetIceParameters() {
-    return IceParameters(ice_ufrag, ice_pwd, HasOption(ICE_RENOMINATION_STR));
+    return IceParameters(ice_ufrag, ice_pwd,
+                         HasOption(ICE_OPTION_RENOMINATION));
   }
 
   static rtc::SSLFingerprint* CopyFingerprint(
       const rtc::SSLFingerprint* from) {
     if (!from)
       return NULL;
 
     return new rtc::SSLFingerprint(*from);
   }
 
+  // These are actually ICE options (appearing in the ice-options attribute in
+  // SDP).
+  // TODO(deadbeef): Rename to ice_options.
   std::vector<std::string> transport_options;
   std::string ice_ufrag;
   std::string ice_pwd;
   IceMode ice_mode;
   ConnectionRole connection_role;
 
   std::unique_ptr<rtc::SSLFingerprint> identity_fingerprint;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_