commit 48d519d67bd6e1b0398d9afd571e888a539a8bf0
parent e08ee80bc95e5b9ffef8175377106318707ca567
Author: Michael Froman <mfroman@mozilla.com>
Date: Wed, 8 Oct 2025 18:29:17 -0500
Bug 1993083 - Vendor libwebrtc from 99d12138cf
Upstream commit: https://webrtc.googlesource.com/src/+/99d12138cfea5d680d6044cfb24a49c00cd61815
Re-enable AddMediaToConnectedBundleDoesNotRestartIce on tsan.
Could not reproduce the issue, might have been fixed with https://webrtc-review.googlesource.com/c/src/+/215403.
(this is a revert of https://webrtc-review.googlesource.com/c/src/+/211868).
Change-Id: I74bbc3be76b361f42b356f3536f979ab618bf9c2
Bug: webrtc:11993
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/398780
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45063}
Diffstat:
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T23:28:04.580971+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T23:29:08.046788+00:00.
# base of lastest vendoring
-bb173f0a40
+99d12138cf
diff --git a/third_party/libwebrtc/pc/peer_connection_integrationtest.cc b/third_party/libwebrtc/pc/peer_connection_integrationtest.cc
@@ -2364,16 +2364,8 @@ TEST_P(PeerConnectionIntegrationTest, EndToEndCallWithIceRenomination) {
// With a max bundle policy and RTCP muxing, adding a new media description to
// the connection should not affect ICE at all because the new media will use
// the existing connection.
-// TODO(bugs.webrtc.org/12538): Fails on tsan.
-#if defined(THREAD_SANITIZER)
-#define MAYBE_AddMediaToConnectedBundleDoesNotRestartIce \
- DISABLED_AddMediaToConnectedBundleDoesNotRestartIce
-#else
-#define MAYBE_AddMediaToConnectedBundleDoesNotRestartIce \
- AddMediaToConnectedBundleDoesNotRestartIce
-#endif
TEST_P(PeerConnectionIntegrationTest,
- MAYBE_AddMediaToConnectedBundleDoesNotRestartIce) {
+ AddMediaToConnectedBundleDoesNotRestartIce) {
PeerConnectionInterface::RTCConfiguration config;
config.bundle_policy = PeerConnectionInterface::kBundlePolicyMaxBundle;
config.rtcp_mux_policy = PeerConnectionInterface::kRtcpMuxPolicyRequire;