commit f4cc2ab5dd16ec85f9a3f9ff07e11c7d2d67d753 parent ac35832a51fea3073af14cb9ebc503c68587cd82 Author: Michael Froman <mfroman@mozilla.com> Date: Wed, 8 Oct 2025 15:18:42 -0500 Bug 1993083 - Vendor libwebrtc from ec2e093baa Upstream commit: https://webrtc.googlesource.com/src/+/ec2e093baa80eeceb1e1e2a1faf1d0031e87032f IWYU p2p and use C++ headers instead of C headers Removing the C headers shown by git grep "<*\.h>" p2p/ using find p2p -name "*.h" -o -name "*.cc" | xargs sed -i '/<stdint.h>/d' followed by find p2p -name "*.h" -o -name "*.cc" | xargs tools_webrtc/iwyu/apply-include-cleaner followed by tools_webrtc/gn_check_autofix.py -C out/Default/ followed by git cl format then manually removing double blank lines and moving a platform specific include to the bottom. Bug: webrtc:42226242 Change-Id: I9e5fcd22cee7358de9b4e2dde4f487f210550fd9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/396824 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Philipp Hancke <phancke@meta.com> Cr-Commit-Position: refs/heads/main@{#44975} Diffstat:
40 files changed, 75 insertions(+), 101 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 /Users/mfroman/no_tm_backup/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /Users/mfroman/no_tm_backup/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-09-18T17:04:49.210958+00:00. +# ./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-08T20:18:32.930622+00:00. # base of lastest vendoring -23d8e44f84 +ec2e093baa diff --git a/third_party/libwebrtc/p2p/BUILD.gn b/third_party/libwebrtc/p2p/BUILD.gn @@ -77,6 +77,7 @@ rtc_library("basic_ice_controller") { ":ice_switch_reason", ":ice_transport_internal", ":p2p_constants", + ":p2p_transport_channel_ice_field_trials", ":transport_description", "../api:array_view", "../api:candidate", @@ -380,6 +381,7 @@ rtc_source_set("ice_controller_factory_interface") { ":connection", ":ice_controller_interface", ":ice_transport_internal", + ":p2p_transport_channel_ice_field_trials", ":transport_description", ] } @@ -539,6 +541,7 @@ rtc_library("packet_transport_internal") { "../rtc_base:network_route", "../rtc_base:socket", "../rtc_base/network:received_packet", + "../rtc_base/network:sent_packet", "../rtc_base/system:rtc_export", "../rtc_base/third_party/sigslot", "//third_party/abseil-cpp/absl/functional:any_invocable", @@ -1143,6 +1146,7 @@ if (rtc_include_tests) { "../rtc_base:threading", "../rtc_base:timeutils", "../rtc_base/network:received_packet", + "../rtc_base/network:sent_packet", "../rtc_base/synchronization:mutex", "../rtc_base/third_party/sigslot", "../test:test_support", @@ -1241,6 +1245,7 @@ if (rtc_include_tests) { "../api/task_queue", "../api/task_queue:pending_task_safety_flag", "../api/test/network_emulation", + "../api/transport:ecn_marking", "../api/transport:enums", "../api/transport:stun_types", "../api/units:data_rate", diff --git a/third_party/libwebrtc/p2p/base/async_stun_tcp_socket.cc b/third_party/libwebrtc/p2p/base/async_stun_tcp_socket.cc @@ -10,10 +10,7 @@ #include "p2p/base/async_stun_tcp_socket.h" -#include <errno.h> -#include <stdint.h> -#include <string.h> - +#include <cerrno> #include <cstddef> #include <cstdint> diff --git a/third_party/libwebrtc/p2p/base/async_stun_tcp_socket.h b/third_party/libwebrtc/p2p/base/async_stun_tcp_socket.h @@ -11,8 +11,7 @@ #ifndef P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_ #define P2P_BASE_ASYNC_STUN_TCP_SOCKET_H_ -#include <stddef.h> - +#include <cstddef> #include <cstdint> #include "api/array_view.h" diff --git a/third_party/libwebrtc/p2p/base/async_stun_tcp_socket_unittest.cc b/third_party/libwebrtc/p2p/base/async_stun_tcp_socket_unittest.cc @@ -10,9 +10,8 @@ #include "p2p/base/async_stun_tcp_socket.h" -#include <stdint.h> -#include <string.h> - +#include <cstddef> +#include <cstring> #include <list> #include <memory> #include <string> diff --git a/third_party/libwebrtc/p2p/base/basic_ice_controller.h b/third_party/libwebrtc/p2p/base/basic_ice_controller.h @@ -26,6 +26,7 @@ #include "p2p/base/ice_switch_reason.h" #include "p2p/base/ice_transport_internal.h" #include "p2p/base/p2p_constants.h" +#include "p2p/base/p2p_transport_channel_ice_field_trials.h" #include "p2p/base/transport_description.h" #include "rtc_base/network.h" #include "rtc_base/network_constants.h" diff --git a/third_party/libwebrtc/p2p/base/basic_packet_socket_factory.cc b/third_party/libwebrtc/p2p/base/basic_packet_socket_factory.cc @@ -10,8 +10,6 @@ #include "p2p/base/basic_packet_socket_factory.h" -#include <stddef.h> - #include <cstdint> #include <memory> #include <string> diff --git a/third_party/libwebrtc/p2p/base/basic_packet_socket_factory.h b/third_party/libwebrtc/p2p/base/basic_packet_socket_factory.h @@ -11,8 +11,7 @@ #ifndef P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_ #define P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_ -#include <stdint.h> - +#include <cstdint> #include <memory> #include "api/async_dns_resolver.h" diff --git a/third_party/libwebrtc/p2p/base/connection.cc b/third_party/libwebrtc/p2p/base/connection.cc @@ -10,9 +10,8 @@ #include "p2p/base/connection.h" -#include <math.h> - #include <algorithm> +#include <cmath> #include <cstddef> #include <cstdint> #include <memory> diff --git a/third_party/libwebrtc/p2p/base/connection.h b/third_party/libwebrtc/p2p/base/connection.h @@ -11,8 +11,7 @@ #ifndef P2P_BASE_CONNECTION_H_ #define P2P_BASE_CONNECTION_H_ -#include <stddef.h> - +#include <cstddef> #include <cstdint> #include <functional> #include <memory> diff --git a/third_party/libwebrtc/p2p/base/ice_controller_factory_interface.h b/third_party/libwebrtc/p2p/base/ice_controller_factory_interface.h @@ -18,6 +18,7 @@ #include "p2p/base/connection.h" #include "p2p/base/ice_controller_interface.h" #include "p2p/base/ice_transport_internal.h" +#include "p2p/base/p2p_transport_channel_ice_field_trials.h" #include "p2p/base/transport_description.h" namespace webrtc { diff --git a/third_party/libwebrtc/p2p/base/ice_controller_interface.h b/third_party/libwebrtc/p2p/base/ice_controller_interface.h @@ -20,7 +20,6 @@ #include "p2p/base/connection.h" #include "p2p/base/ice_switch_reason.h" #include "p2p/base/ice_transport_internal.h" -#include "p2p/base/p2p_transport_channel_ice_field_trials.h" #include "p2p/base/transport_description.h" #include "rtc_base/checks.h" #include "rtc_base/system/rtc_export.h" diff --git a/third_party/libwebrtc/p2p/base/ice_transport_internal.h b/third_party/libwebrtc/p2p/base/ice_transport_internal.h @@ -11,8 +11,7 @@ #ifndef P2P_BASE_ICE_TRANSPORT_INTERNAL_H_ #define P2P_BASE_ICE_TRANSPORT_INTERNAL_H_ -#include <stdint.h> - +#include <cstdint> #include <functional> #include <optional> #include <string> diff --git a/third_party/libwebrtc/p2p/base/p2p_constants.h b/third_party/libwebrtc/p2p/base/p2p_constants.h @@ -11,8 +11,8 @@ #ifndef P2P_BASE_P2P_CONSTANTS_H_ #define P2P_BASE_P2P_CONSTANTS_H_ -#include <stddef.h> -#include <stdint.h> +#include <cstddef> +#include <cstdint> #include "rtc_base/system/rtc_export.h" diff --git a/third_party/libwebrtc/p2p/base/p2p_transport_channel.cc b/third_party/libwebrtc/p2p/base/p2p_transport_channel.cc @@ -10,12 +10,11 @@ #include "p2p/base/p2p_transport_channel.h" -#include <errno.h> -#include <stdlib.h> - #include <algorithm> +#include <cerrno> #include <cstdint> #include <cstdio> +#include <cstdlib> #include <functional> #include <memory> #include <optional> diff --git a/third_party/libwebrtc/p2p/base/p2p_transport_channel.h b/third_party/libwebrtc/p2p/base/p2p_transport_channel.h @@ -20,9 +20,8 @@ #ifndef P2P_BASE_P2P_TRANSPORT_CHANNEL_H_ #define P2P_BASE_P2P_TRANSPORT_CHANNEL_H_ -#include <stddef.h> -#include <stdint.h> - +#include <cstddef> +#include <cstdint> #include <functional> #include <map> #include <memory> diff --git a/third_party/libwebrtc/p2p/base/packet_transport_internal.h b/third_party/libwebrtc/p2p/base/packet_transport_internal.h @@ -20,6 +20,7 @@ #include "rtc_base/async_packet_socket.h" #include "rtc_base/callback_list.h" #include "rtc_base/network/received_packet.h" +#include "rtc_base/network/sent_packet.h" #include "rtc_base/network_route.h" #include "rtc_base/socket.h" #include "rtc_base/system/rtc_export.h" diff --git a/third_party/libwebrtc/p2p/base/packet_transport_internal_unittest.cc b/third_party/libwebrtc/p2p/base/packet_transport_internal_unittest.cc @@ -12,8 +12,8 @@ #include <optional> +#include "api/transport/ecn_marking.h" #include "p2p/test/fake_packet_transport.h" -#include "rtc_base/network/ecn_marking.h" #include "rtc_base/network/received_packet.h" #include "rtc_base/socket_address.h" #include "test/gmock.h" diff --git a/third_party/libwebrtc/p2p/base/port.cc b/third_party/libwebrtc/p2p/base/port.cc @@ -24,7 +24,6 @@ #include "absl/strings/string_view.h" #include "api/array_view.h" #include "api/candidate.h" -#include "api/rtc_error.h" #include "api/sequence_checker.h" #include "api/task_queue/task_queue_base.h" #include "api/transport/stun.h" diff --git a/third_party/libwebrtc/p2p/base/port.h b/third_party/libwebrtc/p2p/base/port.h @@ -11,9 +11,8 @@ #ifndef P2P_BASE_PORT_H_ #define P2P_BASE_PORT_H_ -#include <stddef.h> -#include <stdint.h> - +#include <cstddef> +#include <cstdint> #include <functional> #include <map> #include <memory> diff --git a/third_party/libwebrtc/p2p/base/port_allocator.cc b/third_party/libwebrtc/p2p/base/port_allocator.cc @@ -14,7 +14,6 @@ #include <iterator> #include <memory> #include <optional> -#include <set> #include <utility> #include <vector> diff --git a/third_party/libwebrtc/p2p/base/port_allocator.h b/third_party/libwebrtc/p2p/base/port_allocator.h @@ -11,8 +11,7 @@ #ifndef P2P_BASE_PORT_ALLOCATOR_H_ #define P2P_BASE_PORT_ALLOCATOR_H_ -#include <stdint.h> - +#include <cstdint> #include <memory> #include <optional> #include <string> diff --git a/third_party/libwebrtc/p2p/base/port_unittest.cc b/third_party/libwebrtc/p2p/base/port_unittest.cc @@ -10,10 +10,10 @@ #include "p2p/base/port.h" -#include <string.h> - #include <cmath> +#include <cstddef> #include <cstdint> +#include <cstring> #include <limits> #include <list> #include <memory> diff --git a/third_party/libwebrtc/p2p/base/pseudo_tcp.cc b/third_party/libwebrtc/p2p/base/pseudo_tcp.cc @@ -10,12 +10,11 @@ #include "p2p/base/pseudo_tcp.h" -#include <errno.h> -#include <stdio.h> -#include <string.h> - #include <algorithm> +#include <cerrno> +#include <cstddef> #include <cstdint> +#include <cstring> #include <memory> #include <set> diff --git a/third_party/libwebrtc/p2p/base/pseudo_tcp.h b/third_party/libwebrtc/p2p/base/pseudo_tcp.h @@ -11,9 +11,8 @@ #ifndef P2P_BASE_PSEUDO_TCP_H_ #define P2P_BASE_PSEUDO_TCP_H_ -#include <stddef.h> -#include <stdint.h> - +#include <cstddef> +#include <cstdint> #include <list> #include <memory> diff --git a/third_party/libwebrtc/p2p/base/pseudo_tcp_unittest.cc b/third_party/libwebrtc/p2p/base/pseudo_tcp_unittest.cc @@ -10,11 +10,10 @@ #include "p2p/base/pseudo_tcp.h" -#include <string.h> - #include <algorithm> #include <cstddef> #include <cstdint> +#include <cstring> #include <string> #include <utility> #include <vector> diff --git a/third_party/libwebrtc/p2p/base/stun_request.h b/third_party/libwebrtc/p2p/base/stun_request.h @@ -11,9 +11,8 @@ #ifndef P2P_BASE_STUN_REQUEST_H_ #define P2P_BASE_STUN_REQUEST_H_ -#include <stddef.h> -#include <stdint.h> - +#include <cstddef> +#include <cstdint> #include <functional> #include <map> #include <memory> diff --git a/third_party/libwebrtc/p2p/base/tcp_port.cc b/third_party/libwebrtc/p2p/base/tcp_port.cc @@ -66,8 +66,7 @@ #include "p2p/base/tcp_port.h" -#include <errno.h> - +#include <cerrno> #include <cstddef> #include <cstdint> #include <list> diff --git a/third_party/libwebrtc/p2p/base/transport_description_factory.cc b/third_party/libwebrtc/p2p/base/transport_description_factory.cc @@ -10,8 +10,6 @@ #include "p2p/base/transport_description_factory.h" -#include <stddef.h> - #include <memory> #include <string> diff --git a/third_party/libwebrtc/p2p/base/transport_description_factory.h b/third_party/libwebrtc/p2p/base/transport_description_factory.h @@ -19,7 +19,6 @@ #include "p2p/base/ice_credentials_iterator.h" #include "p2p/base/transport_description.h" #include "rtc_base/rtc_certificate.h" -#include "rtc_base/ssl_identity.h" namespace webrtc { diff --git a/third_party/libwebrtc/p2p/base/transport_description_factory_unittest.cc b/third_party/libwebrtc/p2p/base/transport_description_factory_unittest.cc @@ -10,8 +10,7 @@ #include "p2p/base/transport_description_factory.h" -#include <stddef.h> - +#include <cstddef> #include <memory> #include <string> #include <vector> diff --git a/third_party/libwebrtc/p2p/base/turn_port.h b/third_party/libwebrtc/p2p/base/turn_port.h @@ -11,8 +11,7 @@ #ifndef P2P_BASE_TURN_PORT_H_ #define P2P_BASE_TURN_PORT_H_ -#include <stdio.h> - +#include <cstddef> #include <cstdint> #include <map> #include <memory> diff --git a/third_party/libwebrtc/p2p/base/turn_port_unittest.cc b/third_party/libwebrtc/p2p/base/turn_port_unittest.cc @@ -7,11 +7,19 @@ * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ +#include "p2p/base/turn_port.h" + #include <cstddef> #include <cstdint> +#include <list> +#include <memory> +#include <optional> #include <string> +#include <utility> +#include <vector> #include "absl/functional/any_invocable.h" +#include "absl/strings/string_view.h" #include "api/array_view.h" #include "api/candidate.h" #include "api/environment/environment.h" @@ -20,56 +28,47 @@ #include "api/test/mock_async_dns_resolver.h" #include "api/test/rtc_error_matchers.h" #include "api/transport/stun.h" -#include "p2p/base/connection_info.h" -#include "p2p/base/port.h" -#include "p2p/base/port_interface.h" -#include "p2p/base/stun_request.h" -#include "p2p/client/relay_port_factory_interface.h" -#include "rtc_base/async_packet_socket.h" -#include "rtc_base/ip_address.h" -#include "rtc_base/net_helpers.h" -#include "rtc_base/network.h" -#include "rtc_base/network/received_packet.h" -#include "rtc_base/third_party/sigslot/sigslot.h" -#include "system_wrappers/include/metrics.h" -#include "test/gmock.h" -#include "test/wait_until.h" -#if defined(WEBRTC_POSIX) -#include <dirent.h> // IWYU pragma: keep - -#include "absl/strings/string_view.h" -#endif - -#include <list> -#include <memory> -#include <optional> -#include <utility> -#include <vector> - #include "api/units/time_delta.h" #include "p2p/base/basic_packet_socket_factory.h" #include "p2p/base/connection.h" +#include "p2p/base/connection_info.h" #include "p2p/base/p2p_constants.h" +#include "p2p/base/port.h" #include "p2p/base/port_allocator.h" +#include "p2p/base/port_interface.h" #include "p2p/base/stun_port.h" +#include "p2p/base/stun_request.h" #include "p2p/base/transport_description.h" -#include "p2p/base/turn_port.h" +#include "p2p/client/relay_port_factory_interface.h" #include "p2p/test/mock_dns_resolving_packet_socket_factory.h" #include "p2p/test/test_turn_customizer.h" #include "p2p/test/test_turn_server.h" #include "p2p/test/turn_server.h" +#include "rtc_base/async_packet_socket.h" #include "rtc_base/buffer.h" #include "rtc_base/byte_buffer.h" #include "rtc_base/checks.h" #include "rtc_base/fake_clock.h" #include "rtc_base/gunit.h" +#include "rtc_base/ip_address.h" #include "rtc_base/net_helper.h" +#include "rtc_base/net_helpers.h" +#include "rtc_base/network.h" +#include "rtc_base/network/received_packet.h" #include "rtc_base/socket.h" #include "rtc_base/socket_address.h" +#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" #include "rtc_base/time_utils.h" #include "rtc_base/virtual_socket_server.h" +#include "system_wrappers/include/metrics.h" +#include "test/gmock.h" #include "test/gtest.h" +#include "test/wait_until.h" + +#if defined(WEBRTC_POSIX) +#include <dirent.h> // IWYU pragma: keep +#endif namespace { using ::testing::_; diff --git a/third_party/libwebrtc/p2p/client/basic_port_allocator.cc b/third_party/libwebrtc/p2p/client/basic_port_allocator.cc @@ -42,7 +42,6 @@ #include "p2p/client/relay_port_factory_interface.h" #include "rtc_base/async_packet_socket.h" #include "rtc_base/checks.h" -#include "rtc_base/crypto_random.h" #include "rtc_base/ip_address.h" #include "rtc_base/logging.h" #include "rtc_base/net_helper.h" diff --git a/third_party/libwebrtc/p2p/dtls/dtls_transport_internal.h b/third_party/libwebrtc/p2p/dtls/dtls_transport_internal.h @@ -11,9 +11,8 @@ #ifndef P2P_DTLS_DTLS_TRANSPORT_INTERNAL_H_ #define P2P_DTLS_DTLS_TRANSPORT_INTERNAL_H_ -#include <stddef.h> -#include <stdint.h> - +#include <cstddef> +#include <cstdint> #include <memory> #include <optional> #include <utility> diff --git a/third_party/libwebrtc/p2p/test/fake_packet_transport.h b/third_party/libwebrtc/p2p/test/fake_packet_transport.h @@ -19,8 +19,10 @@ #include "api/transport/ecn_marking.h" #include "api/units/timestamp.h" #include "p2p/base/packet_transport_internal.h" +#include "rtc_base/async_packet_socket.h" #include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/network/received_packet.h" +#include "rtc_base/network/sent_packet.h" #include "rtc_base/network_route.h" #include "rtc_base/socket.h" #include "rtc_base/socket_address.h" diff --git a/third_party/libwebrtc/p2p/test/nat_socket_factory.h b/third_party/libwebrtc/p2p/test/nat_socket_factory.h @@ -11,8 +11,7 @@ #ifndef P2P_TEST_NAT_SOCKET_FACTORY_H_ #define P2P_TEST_NAT_SOCKET_FACTORY_H_ -#include <stddef.h> - +#include <cstddef> #include <cstdint> #include <map> #include <memory> diff --git a/third_party/libwebrtc/p2p/test/nat_unittest.cc b/third_party/libwebrtc/p2p/test/nat_unittest.cc @@ -8,10 +8,9 @@ * be found in the AUTHORS file in the root of the source tree. */ -#include <string.h> - #include <algorithm> #include <cstddef> +#include <cstring> #include <memory> #include <vector> diff --git a/third_party/libwebrtc/p2p/test/stun_server.h b/third_party/libwebrtc/p2p/test/stun_server.h @@ -11,8 +11,6 @@ #ifndef P2P_TEST_STUN_SERVER_H_ #define P2P_TEST_STUN_SERVER_H_ -#include <stddef.h> - #include <memory> #include "absl/strings/string_view.h" diff --git a/third_party/libwebrtc/p2p/test/stun_server_unittest.cc b/third_party/libwebrtc/p2p/test/stun_server_unittest.cc @@ -10,8 +10,7 @@ #include "p2p/test/stun_server.h" -#include <string.h> - +#include <cstring> #include <memory> #include <string>