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

webrtc/pc/peerconnection_integrationtest.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 2490 matching lines @@
   // Do normal offer/answer and wait for some frames to be received in each
   // direction.
   caller()->AddAudioVideoMediaStream();
   callee()->AddAudioVideoMediaStream();
   caller()->CreateAndSetAndSignalOffer();
   ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout);
   // Sanity check that ICE renomination was actually negotiated.
   const cricket::SessionDescription* desc =
       caller()->pc()->local_description()->description();
   for (const cricket::TransportInfo& info : desc->transport_infos()) {
-    ASSERT_NE(info.description.transport_options.end(),
-              std::find(info.description.transport_options.begin(),
-                        info.description.transport_options.end(),
-                        cricket::ICE_RENOMINATION_STR));
+    ASSERT_NE(
+        info.description.transport_options.end(),
+        std::find(info.description.transport_options.begin(),
+                  info.description.transport_options.end(), "renomination"));
   }
   desc = callee()->pc()->local_description()->description();
   for (const cricket::TransportInfo& info : desc->transport_infos()) {
-    ASSERT_NE(info.description.transport_options.end(),
-              std::find(info.description.transport_options.begin(),
-                        info.description.transport_options.end(),
-                        cricket::ICE_RENOMINATION_STR));
+    ASSERT_NE(
+        info.description.transport_options.end(),
+        std::find(info.description.transport_options.begin(),
+                  info.description.transport_options.end(), "renomination"));
   }
   ExpectNewFramesReceivedWithWait(
       kDefaultExpectedAudioFrameCount, kDefaultExpectedVideoFrameCount,
       kDefaultExpectedAudioFrameCount, kDefaultExpectedVideoFrameCount,
       kMaxWaitForFramesMs);
 }
 
 // This test sets up a call between two parties with audio and video. It then
 // renegotiates setting the video m-line to "port 0", then later renegotiates
 // again, enabling video.
@@ skipping 318 matching lines @@
   caller()->CreateAndSetAndSignalOffer();
   ASSERT_TRUE_WAIT(SignalingStateStable(), kDefaultTimeout);
   // Wait for additional audio frames to be received by the callee.
   ExpectNewFramesReceivedWithWait(0, 0, kDefaultExpectedAudioFrameCount, 0,
                                   kMaxWaitForFramesMs);
 }
 
 }  // namespace
 
 #endif  // if !defined(THREAD_SANITIZER)