tor-browser

commit a374c4a8866ce42e8a013010af41e6442cbb1ae4
parent df0d97ea35499d01dd85c933910391daf1ef3f8a
Author: Michael Froman <mfroman@mozilla.com>
Date:   Wed,  8 Oct 2025 16:48:31 -0500

Bug 1993083 - Vendor libwebrtc from 0b167190c5

Upstream commit: https://webrtc.googlesource.com/src/+/0b167190c5ad8459f63f4b6a9fae143bc8e8e61f
    dtls-in-stun: Deflake test case by (temporarily) disabling some combinations

    BUG=webrtc:367395350

    Change-Id: I662a8df1d5b65f275ba90e9c47d2f4f427bb44c2
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/397940
    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
    Auto-Submit: Jonas Oreland <jonaso@webrtc.org>
    Commit-Queue: Harald Alvestrand <hta@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45020}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/pc/data_channel_integrationtest.cc
 | 
14
++++++++++++++

2 files changed, 16 insertions(+), 2 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-08T21:47:20.419501+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T21:48:22.055639+00:00.
 # base of lastest vendoring
-edbf76f93f
+0b167190c5
diff --git a/third_party/libwebrtc/pc/data_channel_integrationtest.cc b/third_party/libwebrtc/pc/data_channel_integrationtest.cc
@@ -1729,6 +1729,20 @@ class DataChannelIntegrationTestUnifiedPlanFieldTrials
         (callee_has_dtls_in_stun || callee2_has_dtls_in_stun)) {
       return "dtls-in-stun when callee(s) are dtls clients";
     }
+
+    /**
+     * This extra skip disables 108 combinations that are flaky.
+     * TODO (jonaso, b/427410792, webrtc:367395350): Should be fixed
+     * before launching dtls in stun
+     */
+    const bool caller_has_dtls_in_stun = absl::StrContains(
+        std::get<1>(GetParam()), "WebRTC-IceHandshakeDtls/Enabled/");
+    if (caller_has_dtls_in_stun &&
+        (!callee_has_dtls_in_stun && !callee2_has_dtls_in_stun)) {
+      return "TODO: b/427410792, webrtc:367395350, dtls-in-stun on caller but "
+             "neither callees";
+    }
+
     return nullptr;
   }
 };