commit 4f581cb483a8ea4bf8cd756b683e6f6ba41824ef parent 125bfba70452c078515be5745cba518ced5fe72d Author: Michael Froman <mfroman@mozilla.com> Date: Wed, 8 Oct 2025 17:41:08 -0500 Bug 1993083 - Vendor libwebrtc from 50e4b6ac27 Upstream commit: https://webrtc.googlesource.com/src/+/50e4b6ac2757b4881faf8dc029103dda7e28017e Do not set global field trial string in WebRTC tests Tests that use field trials were updated to populate field trials with CreateTestFieldTrials function and thus would use force_fieldtrials flags when provided. Bug: webrtc:419453427 Change-Id: I0ad50a75119ead85bf093b99f7c214d6adc9d031 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/398600 Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Jeremy Leconte <jleconte@google.com> Cr-Commit-Position: refs/heads/main@{#45055} Diffstat:
8 files changed, 8 insertions(+), 28 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-08T22:39:36.400259+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T22:40:58.452032+00:00. # base of lastest vendoring -e893a74fdd +50e4b6ac27 diff --git a/third_party/libwebrtc/moz-patch-stack/s0027.patch b/third_party/libwebrtc/moz-patch-stack/s0027.patch @@ -1194,7 +1194,7 @@ index c1181618e9..4a772795ed 100644 deps += [ "..:logging", diff --git a/test/BUILD.gn b/test/BUILD.gn -index c65a46417a..347975c8c5 100644 +index f5dd45f86b..c206c33f49 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -258,6 +258,7 @@ rtc_library("audio_test_common") { @@ -1236,7 +1236,7 @@ index c65a46417a..347975c8c5 100644 sources += [ "testsupport/jpeg_frame_writer.cc" ] } else { sources += [ "testsupport/jpeg_frame_writer_ios.cc" ] -@@ -1344,6 +1352,7 @@ if (!build_with_chromium) { +@@ -1337,6 +1345,7 @@ if (!build_with_chromium) { } } @@ -1244,7 +1244,7 @@ index c65a46417a..347975c8c5 100644 if (!build_with_chromium && is_android) { rtc_android_library("native_test_java") { testonly = true -@@ -1386,6 +1395,7 @@ if (!build_with_chromium && is_android) { +@@ -1379,6 +1388,7 @@ if (!build_with_chromium && is_android) { sources = [ "android/org/webrtc/native_test/NativeTestWebrtc.java" ] } } diff --git a/third_party/libwebrtc/moz-patch-stack/s0099.patch b/third_party/libwebrtc/moz-patch-stack/s0099.patch @@ -86,7 +86,7 @@ index 06da79a112..a18d353a0e 100644 if (!build_with_mozilla) { diff --git a/test/BUILD.gn b/test/BUILD.gn -index 347975c8c5..1117b2bb86 100644 +index c206c33f49..6b73a8e345 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -470,6 +470,12 @@ rtc_source_set("test_support") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0103.patch b/third_party/libwebrtc/moz-patch-stack/s0103.patch @@ -756,7 +756,7 @@ index 8222263e1f..913382709e 100644 import("../webrtc.gni") diff --git a/test/BUILD.gn b/test/BUILD.gn -index 1117b2bb86..f9a36d94c9 100644 +index 6b73a8e345..f5367e350c 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -6,10 +6,10 @@ diff --git a/third_party/libwebrtc/test/BUILD.gn b/third_party/libwebrtc/test/BUILD.gn @@ -610,7 +610,6 @@ if (rtc_include_tests) { "../rtc_base:logging", "../rtc_base:ssl_adapter", "../rtc_base:threading", - "../system_wrappers:field_trial", "../system_wrappers:metrics", "//third_party/abseil-cpp/absl/flags:flag", "//third_party/abseil-cpp/absl/memory", @@ -1260,13 +1259,7 @@ if (!build_with_chromium) { "test_flags.h", ] - # TODO: bugs.webrtc.org/419453427 - remove dependency on - # `create_test_field_trials` when force_fieldtrials flags declaration - # is removed from the header. - deps = [ - ":create_test_field_trials", - "//third_party/abseil-cpp/absl/flags:flag", - ] + deps = [ "//third_party/abseil-cpp/absl/flags:flag" ] } rtc_library("test_common") { diff --git a/third_party/libwebrtc/test/test_flags.h b/third_party/libwebrtc/test/test_flags.h @@ -15,11 +15,6 @@ #include "absl/flags/declare.h" -// TODO: bugs.webrtc.org/419453427 - Remove this flag declaration from the -// header when tests are migrated to use this flag through the -// CreateTestFieldTrials function bypassing global field trials string. -ABSL_DECLARE_FLAG(std::string, force_fieldtrials); - ABSL_DECLARE_FLAG(std::vector<std::string>, plot); ABSL_DECLARE_FLAG(std::string, isolated_script_test_perf_output); ABSL_DECLARE_FLAG(std::string, webrtc_test_metrics_output_path); diff --git a/third_party/libwebrtc/test/test_main_lib.cc b/third_party/libwebrtc/test/test_main_lib.cc @@ -34,7 +34,6 @@ #include "rtc_base/logging.h" #include "rtc_base/ssl_adapter.h" #include "rtc_base/ssl_stream_adapter.h" -#include "system_wrappers/include/field_trial.h" #include "system_wrappers/include/metrics.h" #include "test/gtest.h" #include "test/test_flags.h" @@ -142,10 +141,6 @@ class TestMainImpl : public TestMain { LogMessage::SetLogToStderr(absl::GetFlag(FLAGS_logs) || absl::GetFlag(FLAGS_verbose)); - // InitFieldTrialsFromString stores the char*, so the char array must - // outlive the application. - field_trials_ = absl::GetFlag(FLAGS_force_fieldtrials); - field_trial::InitFieldTrialsFromString(field_trials_.c_str()); metrics::Enable(); #if defined(WEBRTC_WIN) diff --git a/third_party/libwebrtc/test/test_main_lib.h b/third_party/libwebrtc/test/test_main_lib.h @@ -11,7 +11,6 @@ #define TEST_TEST_MAIN_LIB_H_ #include <memory> -#include <string> namespace webrtc { @@ -34,8 +33,6 @@ class TestMain { protected: TestMain() = default; - - std::string field_trials_; }; } // namespace webrtc