tor-browser

The Tor Browser
git clone https://git.dasho.dev/tor-browser.git
Log | Files | Refs | README | LICENSE

commit 3812eb8b3d55294a793112d7b54a3438c73d6e09
parent e14c3ecdd66cf32afa4b1848ac708cb0b744fa28
Author: Michael Froman <mfroman@mozilla.com>
Date:   Thu,  9 Oct 2025 13:10:53 -0500

Bug 1993083 - Vendor libwebrtc from 8ac2863ed6

Upstream commit: https://webrtc.googlesource.com/src/+/8ac2863ed6f56a083a7e4c06a663ce3ee01b1dd1
    IWYU api/ call/ examples/ media/ test/ video/

    using
      find api call examples media test video -name "*.h" -o -name "*.cc" |
    xargs tools_webrtc/iwyu/apply-include-cleaner
    followed by
      tools_webrtc/gn_check_autofix.py
    followed by
      git cl format

    api/jsep_ice_candidate.h was reverted, this is a transitional include.

    Bug: webrtc:42226242
    Change-Id: I7028eeb37efffaadbff8b900f58ed18198d7db67
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/399800
    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
    Commit-Queue: Philipp Hancke <phancke@meta.com>
    Cr-Commit-Position: refs/heads/main@{#45133}

Diffstat:
Mthird_party/libwebrtc/README.mozilla.last-vendor | 4++--
Mthird_party/libwebrtc/api/BUILD.gn | 1+
Mthird_party/libwebrtc/api/frame_transformer_interface.h | 1+
Mthird_party/libwebrtc/api/media_types.h | 1-
Mthird_party/libwebrtc/call/BUILD.gn | 1+
Mthird_party/libwebrtc/call/rampup_tests.cc | 2+-
Mthird_party/libwebrtc/examples/BUILD.gn | 4++++
Mthird_party/libwebrtc/examples/peerconnection/client/conductor.cc | 4++--
Mthird_party/libwebrtc/examples/peerconnection/client/peer_connection_client.cc | 11+++++++++++
Mthird_party/libwebrtc/examples/peerconnection/client/peer_connection_client.h | 5+++--
Mthird_party/libwebrtc/examples/peerconnection/server/data_socket.cc | 10+++++-----
Mthird_party/libwebrtc/examples/peerconnection/server/data_socket.h | 5++---
Mthird_party/libwebrtc/examples/stunserver/stunserver_main.cc | 1+
Mthird_party/libwebrtc/examples/turnserver/read_auth_file.cc | 5++++-
Mthird_party/libwebrtc/media/BUILD.gn | 1+
Mthird_party/libwebrtc/media/base/media_channel.h | 2+-
Mthird_party/libwebrtc/moz-patch-stack/s0001.patch | 2+-
Mthird_party/libwebrtc/moz-patch-stack/s0027.patch | 34+++++++++++++++++-----------------
Mthird_party/libwebrtc/moz-patch-stack/s0072.patch | 4++--
Mthird_party/libwebrtc/moz-patch-stack/s0087.patch | 2+-
Mthird_party/libwebrtc/moz-patch-stack/s0101.patch | 2+-
Mthird_party/libwebrtc/moz-patch-stack/s0103.patch | 8++++----
Mthird_party/libwebrtc/moz-patch-stack/s0108.patch | 10+++++-----
Mthird_party/libwebrtc/moz-patch-stack/s0110.patch | 2+-
Mthird_party/libwebrtc/test/network/BUILD.gn | 1+
Mthird_party/libwebrtc/test/network/network_emulation_pc_unittest.cc | 1+
Mthird_party/libwebrtc/test/pc/e2e/BUILD.gn | 1+
Mthird_party/libwebrtc/test/pc/e2e/test_peer_factory.cc | 1+
Mthird_party/libwebrtc/test/peer_scenario/BUILD.gn | 1+
Mthird_party/libwebrtc/test/peer_scenario/peer_scenario_client.cc | 1+
Mthird_party/libwebrtc/video/corruption_detection/evaluation/picture_pair_provider.h | 1-
Mthird_party/libwebrtc/video/corruption_detection/evaluation/test_clip.h | 1-
32 files changed, 78 insertions(+), 52 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-09T18:09:26.930693+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T18:10:43.405783+00:00. # base of lastest vendoring -4b2c2fc299 +8ac2863ed6 diff --git a/third_party/libwebrtc/api/BUILD.gn b/third_party/libwebrtc/api/BUILD.gn @@ -469,6 +469,7 @@ rtc_library("frame_transformer_interface") { ":make_ref_counted", ":ref_count", ":scoped_refptr", + "../rtc_base:checks", "../rtc_base:refcount", "../rtc_base/system:rtc_export", "units:time_delta", diff --git a/third_party/libwebrtc/api/frame_transformer_interface.h b/third_party/libwebrtc/api/frame_transformer_interface.h @@ -22,6 +22,7 @@ #include "api/units/time_delta.h" #include "api/units/timestamp.h" #include "api/video/video_frame_metadata.h" +#include "rtc_base/checks.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/third_party/libwebrtc/api/media_types.h b/third_party/libwebrtc/api/media_types.h @@ -13,7 +13,6 @@ #include <string> -#include "absl/base/macros.h" #include "rtc_base/system/rtc_export.h" namespace webrtc { diff --git a/third_party/libwebrtc/call/BUILD.gn b/third_party/libwebrtc/call/BUILD.gn @@ -658,6 +658,7 @@ if (rtc_include_tests) { "../test/network:simulated_network", "../video/config:encoder_config", "//third_party/abseil-cpp/absl/flags:flag", + "//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/strings:string_view", ] } diff --git a/third_party/libwebrtc/call/rampup_tests.cc b/third_party/libwebrtc/call/rampup_tests.cc @@ -18,6 +18,7 @@ #include <vector> #include "absl/flags/flag.h" +#include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "api/field_trials_view.h" #include "api/make_ref_counted.h" @@ -43,7 +44,6 @@ #include "call/video_receive_stream.h" #include "call/video_send_stream.h" #include "rtc_base/checks.h" -#include "rtc_base/string_encode.h" #include "rtc_base/task_queue_for_test.h" #include "rtc_base/task_utils/repeating_task.h" #include "test/call_test.h" diff --git a/third_party/libwebrtc/examples/BUILD.gn b/third_party/libwebrtc/examples/BUILD.gn @@ -684,6 +684,7 @@ if (is_linux || is_chromeos || is_win) { "../api:async_dns_resolver", "../api:audio_options_api", "../api:create_frame_generator", + "../api:create_modular_peer_connection_factory", "../api:enable_media", "../api:field_trials", "../api:libjingle_peerconnection_api", @@ -716,6 +717,8 @@ if (is_linux || is_chromeos || is_win) { "../rtc_base:net_helpers", "../rtc_base:refcount", "../rtc_base:rtc_certificate_generator", + "../rtc_base:socket", + "../rtc_base:socket_address", "../rtc_base:ssl_adapter", "../rtc_base:stringutils", "../rtc_base:threading", @@ -832,6 +835,7 @@ if (is_linux || is_chromeos || is_win) { "../p2p:p2p_server_utils", "../pc:rtc_pc", "../rtc_base:async_udp_socket", + "../rtc_base:checks", "../rtc_base:socket_address", "../rtc_base:socket_server", "../rtc_base:threading", diff --git a/third_party/libwebrtc/examples/peerconnection/client/conductor.cc b/third_party/libwebrtc/examples/peerconnection/client/conductor.cc @@ -10,8 +10,7 @@ #include "examples/peerconnection/client/conductor.h" -#include <stddef.h> - +#include <cstddef> #include <memory> #include <optional> #include <string> @@ -23,6 +22,7 @@ #include "api/audio_codecs/builtin_audio_decoder_factory.h" #include "api/audio_codecs/builtin_audio_encoder_factory.h" #include "api/audio_options.h" +#include "api/create_modular_peer_connection_factory.h" #include "api/enable_media.h" #include "api/environment/environment.h" #include "api/jsep.h" diff --git a/third_party/libwebrtc/examples/peerconnection/client/peer_connection_client.cc b/third_party/libwebrtc/examples/peerconnection/client/peer_connection_client.cc @@ -10,12 +10,23 @@ #include "examples/peerconnection/client/peer_connection_client.h" +#include <cerrno> +#include <cstddef> +#include <cstdio> +#include <cstdlib> +#include <cstring> +#include <memory> +#include <string> + +#include "api/async_dns_resolver.h" +#include "api/task_queue/pending_task_safety_flag.h" #include "api/units/time_delta.h" #include "examples/peerconnection/client/defaults.h" #include "rtc_base/async_dns_resolver.h" #include "rtc_base/checks.h" #include "rtc_base/logging.h" #include "rtc_base/net_helpers.h" +#include "rtc_base/socket.h" #include "rtc_base/thread.h" namespace { diff --git a/third_party/libwebrtc/examples/peerconnection/client/peer_connection_client.h b/third_party/libwebrtc/examples/peerconnection/client/peer_connection_client.h @@ -11,14 +11,15 @@ #ifndef EXAMPLES_PEERCONNECTION_CLIENT_PEER_CONNECTION_CLIENT_H_ #define EXAMPLES_PEERCONNECTION_CLIENT_PEER_CONNECTION_CLIENT_H_ +#include <cstddef> #include <map> #include <memory> #include <string> #include "api/async_dns_resolver.h" #include "api/task_queue/pending_task_safety_flag.h" -#include "rtc_base/net_helpers.h" -#include "rtc_base/physical_socket_server.h" +#include "rtc_base/socket.h" +#include "rtc_base/socket_address.h" #include "rtc_base/third_party/sigslot/sigslot.h" typedef std::map<int, std::string> Peers; diff --git a/third_party/libwebrtc/examples/peerconnection/server/data_socket.cc b/third_party/libwebrtc/examples/peerconnection/server/data_socket.cc @@ -10,11 +10,10 @@ #include "examples/peerconnection/server/data_socket.h" -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - #include <cctype> +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <string> #include "absl/strings/str_cat.h" @@ -24,7 +23,8 @@ #include "rtc_base/net_helpers.h" #if defined(WEBRTC_POSIX) -#include <unistd.h> +#include <asm-generic/socket.h> +#include <unistd.h> // IWYU pragma: keep #endif static const char kHeaderTerminator[] = "\r\n\r\n"; diff --git a/third_party/libwebrtc/examples/peerconnection/server/data_socket.h b/third_party/libwebrtc/examples/peerconnection/server/data_socket.h @@ -11,16 +11,15 @@ #ifndef EXAMPLES_PEERCONNECTION_SERVER_DATA_SOCKET_H_ #define EXAMPLES_PEERCONNECTION_SERVER_DATA_SOCKET_H_ +#include <cstddef> #include <string> -#include "rtc_base/ip_address.h" -#include "rtc_base/net_helpers.h" #ifdef WIN32 +#include <winsock2.h> typedef int socklen_t; typedef SOCKET NativeSocket; #else -#include <sys/select.h> #define closesocket close typedef int NativeSocket; diff --git a/third_party/libwebrtc/examples/stunserver/stunserver_main.cc b/third_party/libwebrtc/examples/stunserver/stunserver_main.cc @@ -11,6 +11,7 @@ #include "p2p/test/stun_server.h" #include "rtc_base/async_udp_socket.h" +#include "rtc_base/checks.h" #include "rtc_base/socket_address.h" #include "rtc_base/socket_server.h" #include "rtc_base/thread.h" diff --git a/third_party/libwebrtc/examples/turnserver/read_auth_file.cc b/third_party/libwebrtc/examples/turnserver/read_auth_file.cc @@ -10,7 +10,10 @@ #include "examples/turnserver/read_auth_file.h" -#include <stddef.h> +#include <cstddef> +#include <istream> +#include <map> +#include <string> #include "absl/strings/string_view.h" #include "api/array_view.h" diff --git a/third_party/libwebrtc/media/BUILD.gn b/third_party/libwebrtc/media/BUILD.gn @@ -371,6 +371,7 @@ rtc_source_set("media_channel") { "../rtc_base/network:sent_packet", "../video/config:encoder_config", "//third_party/abseil-cpp/absl/functional:any_invocable", + "//third_party/abseil-cpp/absl/strings", "//third_party/abseil-cpp/absl/strings:string_view", ] } diff --git a/third_party/libwebrtc/media/base/media_channel.h b/third_party/libwebrtc/media/base/media_channel.h @@ -23,6 +23,7 @@ #include <vector> #include "absl/functional/any_invocable.h" +#include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "api/audio/audio_processing_statistics.h" #include "api/audio_codecs/audio_encoder.h" @@ -60,7 +61,6 @@ #include "rtc_base/network/sent_packet.h" #include "rtc_base/network_route.h" #include "rtc_base/socket.h" -#include "rtc_base/string_encode.h" #include "rtc_base/strings/string_builder.h" namespace webrtc { diff --git a/third_party/libwebrtc/moz-patch-stack/s0001.patch b/third_party/libwebrtc/moz-patch-stack/s0001.patch @@ -413,7 +413,7 @@ index 06c581157a..8a5bbd8631 100644 bool RtpExtension::IsSupportedForVideo(absl::string_view uri) { diff --git a/call/BUILD.gn b/call/BUILD.gn -index 06a92df849..e8d2d469cb 100644 +index 2b796266c2..01b4bcf984 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -20,6 +20,7 @@ rtc_library("call_interfaces") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0027.patch b/third_party/libwebrtc/moz-patch-stack/s0027.patch @@ -203,7 +203,7 @@ index ef4a7d286f..b064aac57b 100644 } diff --git a/api/BUILD.gn b/api/BUILD.gn -index 2dbc1c17ba..f1c2c2e3a4 100644 +index c5810b61a8..b6da9b6920 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -44,6 +44,9 @@ rtc_library("enable_media") { @@ -300,7 +300,7 @@ index 2dbc1c17ba..f1c2c2e3a4 100644 rtc_library("frame_transformer_interface") { visibility = [ "*" ] -@@ -646,6 +675,7 @@ rtc_source_set("peer_network_dependencies") { +@@ -647,6 +676,7 @@ rtc_source_set("peer_network_dependencies") { } rtc_source_set("peer_connection_quality_test_fixture_api") { @@ -308,7 +308,7 @@ index 2dbc1c17ba..f1c2c2e3a4 100644 visibility = [ "*" ] testonly = true sources = [ "test/peerconnection_quality_test_fixture.h" ] -@@ -690,6 +720,7 @@ rtc_source_set("peer_connection_quality_test_fixture_api") { +@@ -691,6 +721,7 @@ rtc_source_set("peer_connection_quality_test_fixture_api") { "//third_party/abseil-cpp/absl/strings:string_view", ] } @@ -316,7 +316,7 @@ index 2dbc1c17ba..f1c2c2e3a4 100644 rtc_library("frame_generator_api") { visibility = [ "*" ] -@@ -795,6 +826,7 @@ rtc_library("create_frame_generator") { +@@ -796,6 +827,7 @@ rtc_library("create_frame_generator") { ] } @@ -324,7 +324,7 @@ index 2dbc1c17ba..f1c2c2e3a4 100644 rtc_library("create_peer_connection_quality_test_frame_generator") { visibility = [ "*" ] testonly = true -@@ -812,6 +844,7 @@ rtc_library("create_peer_connection_quality_test_frame_generator") { +@@ -813,6 +845,7 @@ rtc_library("create_peer_connection_quality_test_frame_generator") { "units:time_delta", ] } @@ -332,7 +332,7 @@ index 2dbc1c17ba..f1c2c2e3a4 100644 rtc_source_set("data_channel_event_observer_interface") { visibility = [ "*" ] -@@ -1004,6 +1037,7 @@ rtc_source_set("refcountedbase") { +@@ -1005,6 +1038,7 @@ rtc_source_set("refcountedbase") { } rtc_library("ice_transport_factory") { @@ -340,7 +340,7 @@ index 2dbc1c17ba..f1c2c2e3a4 100644 visibility = [ "*" ] sources = [ "ice_transport_factory.cc", -@@ -1027,6 +1061,7 @@ rtc_library("ice_transport_factory") { +@@ -1028,6 +1062,7 @@ rtc_library("ice_transport_factory") { "rtc_event_log:rtc_event_log", ] } @@ -478,7 +478,7 @@ index 11b03496be..3cc8835a5e 100644 if (rtc_include_tests) { rtc_source_set("test_feedback_generator_interface") { diff --git a/call/BUILD.gn b/call/BUILD.gn -index e8d2d469cb..c9f5a37bed 100644 +index 01b4bcf984..ff746af7d4 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -48,7 +48,7 @@ rtc_library("call_interfaces") { @@ -549,7 +549,7 @@ index 9cb0f770ca..0031392f8a 100644 #include "rtc_base/memory/aligned_malloc.h" diff --git a/media/BUILD.gn b/media/BUILD.gn -index 421e7ba136..309af412f7 100644 +index 3c1647e0b7..d70b62b608 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -77,7 +77,7 @@ rtc_library("rtc_media_base") { @@ -609,7 +609,7 @@ index 421e7ba136..309af412f7 100644 rtc_source_set("media_channel") { sources = [ "base/media_channel.h" ] -@@ -409,6 +426,7 @@ rtc_library("codec_list") { +@@ -410,6 +427,7 @@ rtc_library("codec_list") { } rtc_library("rtp_utils") { @@ -617,7 +617,7 @@ index 421e7ba136..309af412f7 100644 sources = [ "base/rtp_utils.cc", "base/rtp_utils.h", -@@ -425,8 +443,10 @@ rtc_library("rtp_utils") { +@@ -426,8 +444,10 @@ rtc_library("rtp_utils") { "//third_party/abseil-cpp/absl/strings:string_view", ] } @@ -628,7 +628,7 @@ index 421e7ba136..309af412f7 100644 sources = [ "base/stream_params.cc", "base/stream_params.h", -@@ -440,6 +460,7 @@ rtc_library("stream_params") { +@@ -441,6 +461,7 @@ rtc_library("stream_params") { "//third_party/abseil-cpp/absl/algorithm:container", ] } @@ -636,7 +636,7 @@ index 421e7ba136..309af412f7 100644 rtc_library("media_constants") { sources = [ -@@ -450,6 +471,7 @@ rtc_library("media_constants") { +@@ -451,6 +472,7 @@ rtc_library("media_constants") { } rtc_library("turn_utils") { @@ -644,7 +644,7 @@ index 421e7ba136..309af412f7 100644 sources = [ "base/turn_utils.cc", "base/turn_utils.h", -@@ -460,14 +482,17 @@ rtc_library("turn_utils") { +@@ -461,14 +483,17 @@ rtc_library("turn_utils") { "../rtc_base/system:rtc_export", ] } @@ -662,7 +662,7 @@ index 421e7ba136..309af412f7 100644 rtc_library("rtc_simulcast_encoder_adapter") { visibility = [ "*" ] -@@ -548,6 +573,11 @@ rtc_library("rtc_internal_video_codecs") { +@@ -549,6 +574,11 @@ rtc_library("rtc_internal_video_codecs") { "//third_party/abseil-cpp/absl/container:inlined_vector", "//third_party/abseil-cpp/absl/strings", ] @@ -674,7 +674,7 @@ index 421e7ba136..309af412f7 100644 if (enable_libaom) { defines += [ "RTC_USE_LIBAOM_AV1_ENCODER" ] -@@ -567,6 +597,13 @@ rtc_library("rtc_internal_video_codecs") { +@@ -568,6 +598,13 @@ rtc_library("rtc_internal_video_codecs") { "engine/internal_encoder_factory.cc", "engine/internal_encoder_factory.h", ] @@ -689,7 +689,7 @@ index 421e7ba136..309af412f7 100644 rtc_library("rtc_audio_video") { diff --git a/media/base/media_channel.h b/media/base/media_channel.h -index f920b55ed5..91f2105c5d 100644 +index 6a3463937c..9247d6837b 100644 --- a/media/base/media_channel.h +++ b/media/base/media_channel.h @@ -67,9 +67,6 @@ namespace webrtc { diff --git a/third_party/libwebrtc/moz-patch-stack/s0072.patch b/third_party/libwebrtc/moz-patch-stack/s0072.patch @@ -18,10 +18,10 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/2f1a0ba74bf71cfa0 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/api/frame_transformer_interface.h b/api/frame_transformer_interface.h -index db3a8cdac3..f6b884fd7d 100644 +index 904a2ef3b0..4d34eb4bae 100644 --- a/api/frame_transformer_interface.h +++ b/api/frame_transformer_interface.h -@@ -113,6 +113,7 @@ class TransformableVideoFrameInterface : public TransformableFrameInterface { +@@ -114,6 +114,7 @@ class TransformableVideoFrameInterface : public TransformableFrameInterface { RTC_EXPORT explicit TransformableVideoFrameInterface(Passkey passkey); virtual ~TransformableVideoFrameInterface() = default; virtual bool IsKeyFrame() const = 0; diff --git a/third_party/libwebrtc/moz-patch-stack/s0087.patch b/third_party/libwebrtc/moz-patch-stack/s0087.patch @@ -9,7 +9,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/60304c5d8a86fdecf 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/media/BUILD.gn b/media/BUILD.gn -index 309af412f7..d249da5fd9 100644 +index d70b62b608..ec9fb184fa 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -56,6 +56,11 @@ rtc_library("rtc_media_base") { diff --git a/third_party/libwebrtc/moz-patch-stack/s0101.patch b/third_party/libwebrtc/moz-patch-stack/s0101.patch @@ -26,7 +26,7 @@ index 851c745732..cdbd705ec2 100644 # These are the targets to skip header checking by default. The files in targets # matching these patterns (see "gn help label_pattern" for format) will not have diff --git a/media/BUILD.gn b/media/BUILD.gn -index d249da5fd9..a992a032c5 100644 +index ec9fb184fa..82b4bbfbae 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -7,7 +7,7 @@ diff --git a/third_party/libwebrtc/moz-patch-stack/s0103.patch b/third_party/libwebrtc/moz-patch-stack/s0103.patch @@ -126,7 +126,7 @@ index cf7548754f..2e0fd6721d 100644 "Generated during 'gn gen' by //BUILD.gn.", "", diff --git a/api/BUILD.gn b/api/BUILD.gn -index f1c2c2e3a4..9e605c4920 100644 +index b6da9b6920..eda94a3854 100644 --- a/api/BUILD.gn +++ b/api/BUILD.gn @@ -8,8 +8,8 @@ @@ -326,7 +326,7 @@ index 589142b014..2ee80ded55 100644 } } diff --git a/examples/BUILD.gn b/examples/BUILD.gn -index 4508146c93..e8306f3daa 100644 +index 9addddedc8..fef8e4ec56 100644 --- a/examples/BUILD.gn +++ b/examples/BUILD.gn @@ -9,15 +9,15 @@ @@ -359,7 +359,7 @@ index 4508146c93..e8306f3daa 100644 "//third_party/ocmock", ] } -@@ -736,7 +736,7 @@ if (is_linux || is_chromeos || is_win) { +@@ -739,7 +739,7 @@ if (is_linux || is_chromeos || is_win) { "peerconnection/client/main_wnd.cc", "peerconnection/client/main_wnd.h", ] @@ -427,7 +427,7 @@ index 576980c5ab..2a8b864d5b 100644 group("logging") { diff --git a/media/BUILD.gn b/media/BUILD.gn -index a992a032c5..6f2dc22e00 100644 +index 82b4bbfbae..b58cb6ba9a 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -6,7 +6,7 @@ diff --git a/third_party/libwebrtc/moz-patch-stack/s0108.patch b/third_party/libwebrtc/moz-patch-stack/s0108.patch @@ -38,7 +38,7 @@ index 1107653026..2bc18e49cf 100644 ] # Added when we removed deps in other places to avoid building diff --git a/media/BUILD.gn b/media/BUILD.gn -index 6f2dc22e00..e3ee0fe861 100644 +index b58cb6ba9a..4299453d22 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -12,12 +12,10 @@ import("../webrtc.gni") @@ -68,7 +68,7 @@ index 6f2dc22e00..e3ee0fe861 100644 } } -@@ -430,6 +431,7 @@ rtc_library("codec_list") { +@@ -431,6 +432,7 @@ rtc_library("codec_list") { ] } @@ -76,7 +76,7 @@ index 6f2dc22e00..e3ee0fe861 100644 rtc_library("rtp_utils") { if (!build_with_mozilla) { sources = [ -@@ -476,7 +478,6 @@ rtc_library("media_constants") { +@@ -477,7 +479,6 @@ rtc_library("media_constants") { } rtc_library("turn_utils") { @@ -84,7 +84,7 @@ index 6f2dc22e00..e3ee0fe861 100644 sources = [ "base/turn_utils.cc", "base/turn_utils.h", -@@ -487,17 +488,14 @@ if (!build_with_mozilla) { +@@ -488,17 +489,14 @@ if (!build_with_mozilla) { "../rtc_base/system:rtc_export", ] } @@ -102,7 +102,7 @@ index 6f2dc22e00..e3ee0fe861 100644 rtc_library("rtc_simulcast_encoder_adapter") { visibility = [ "*" ] -@@ -715,6 +713,12 @@ rtc_library("rtc_audio_video") { +@@ -716,6 +714,12 @@ rtc_library("rtc_audio_video") { "engine/webrtc_voice_engine.cc", "engine/webrtc_voice_engine.h", ] diff --git a/third_party/libwebrtc/moz-patch-stack/s0110.patch b/third_party/libwebrtc/moz-patch-stack/s0110.patch @@ -10,7 +10,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/b6dd815fc9d2df718 1 file changed, 11 deletions(-) diff --git a/media/BUILD.gn b/media/BUILD.gn -index e3ee0fe861..d4f9d62f2f 100644 +index 4299453d22..4540173949 100644 --- a/media/BUILD.gn +++ b/media/BUILD.gn @@ -54,11 +54,6 @@ rtc_library("rtc_media_base") { diff --git a/third_party/libwebrtc/test/network/BUILD.gn b/third_party/libwebrtc/test/network/BUILD.gn @@ -105,6 +105,7 @@ if (rtc_include_tests && !build_with_chromium) { "..:test_support", "..:wait_until", "../../api:audio_options_api", + "../../api:create_modular_peer_connection_factory", "../../api:enable_media_with_defaults", "../../api:libjingle_peerconnection_api", "../../api:media_stream_interface", diff --git a/third_party/libwebrtc/test/network/network_emulation_pc_unittest.cc b/third_party/libwebrtc/test/network/network_emulation_pc_unittest.cc @@ -13,6 +13,7 @@ #include <vector> #include "api/audio_options.h" +#include "api/create_modular_peer_connection_factory.h" #include "api/enable_media_with_defaults.h" #include "api/environment/environment.h" #include "api/environment/environment_factory.h" diff --git a/third_party/libwebrtc/test/pc/e2e/BUILD.gn b/third_party/libwebrtc/test/pc/e2e/BUILD.gn @@ -106,6 +106,7 @@ if (!build_with_chromium) { ":echo_emulation", ":test_peer", "../..:copy_to_file_audio_capturer", + "../../../api:create_modular_peer_connection_factory", "../../../api:enable_media_with_defaults", "../../../api:libjingle_peerconnection_api", "../../../api:scoped_refptr", diff --git a/third_party/libwebrtc/test/pc/e2e/test_peer_factory.cc b/third_party/libwebrtc/test/pc/e2e/test_peer_factory.cc @@ -19,6 +19,7 @@ #include "absl/memory/memory.h" #include "absl/strings/string_view.h" #include "api/audio/audio_device.h" +#include "api/create_modular_peer_connection_factory.h" #include "api/enable_media_with_defaults.h" #include "api/environment/environment.h" #include "api/environment/environment_factory.h" diff --git a/third_party/libwebrtc/test/peer_scenario/BUILD.gn b/third_party/libwebrtc/test/peer_scenario/BUILD.gn @@ -31,6 +31,7 @@ if (rtc_include_tests) { "../../api:array_view", "../../api:audio_options_api", "../../api:candidate", + "../../api:create_modular_peer_connection_factory", "../../api:enable_media_with_defaults", "../../api:field_trials", "../../api:libjingle_peerconnection_api", diff --git a/third_party/libwebrtc/test/peer_scenario/peer_scenario_client.cc b/third_party/libwebrtc/test/peer_scenario/peer_scenario_client.cc @@ -22,6 +22,7 @@ #include "absl/memory/memory.h" #include "api/audio_options.h" #include "api/candidate.h" +#include "api/create_modular_peer_connection_factory.h" #include "api/data_channel_interface.h" #include "api/enable_media_with_defaults.h" #include "api/environment/environment.h" diff --git a/third_party/libwebrtc/video/corruption_detection/evaluation/picture_pair_provider.h b/third_party/libwebrtc/video/corruption_detection/evaluation/picture_pair_provider.h @@ -15,7 +15,6 @@ #include "api/units/data_rate.h" #include "api/video/video_frame.h" -#include "test/testsupport/file_utils.h" #include "video/corruption_detection/evaluation/test_clip.h" namespace webrtc { diff --git a/third_party/libwebrtc/video/corruption_detection/evaluation/test_clip.h b/third_party/libwebrtc/video/corruption_detection/evaluation/test_clip.h @@ -15,7 +15,6 @@ #include "absl/strings/string_view.h" #include "api/video_codecs/video_codec.h" -#include "test/testsupport/file_utils.h" namespace webrtc {