commit f6c7777d4b7e47a702ca97235d6843b10801e76e parent 3e09e9207e287d485c9adf47a6ced76f7a2418fc Author: Dan Baker <dbaker@mozilla.com> Date: Wed, 22 Oct 2025 13:54:13 -0600 Bug 1995393 - Vendor libwebrtc from d22c6e6cb9 Upstream commit: https://webrtc.googlesource.com/src/+/d22c6e6cb925129de14854d35485aad81cc50604 Clean up unused sigslot from unit tests Bug: webrtc:42222066 Change-Id: I08a32ddefefa8dc29828e7e3007cf89d62ccfb7a Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/403222 Commit-Queue: Philipp Hancke <phancke@meta.com> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45287} Diffstat:
7 files changed, 10 insertions(+), 17 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/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-22T19:51:59.065157+00:00. +libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-22T19:54:03.757577+00:00. # base of lastest vendoring -338a3a1041 +d22c6e6cb9 diff --git a/third_party/libwebrtc/pc/channel_unittest.cc b/third_party/libwebrtc/pc/channel_unittest.cc @@ -57,7 +57,6 @@ #include "rtc_base/socket.h" #include "rtc_base/ssl_identity.h" #include "rtc_base/task_queue_for_test.h" -#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" #include "rtc_base/unique_id_generator.h" #include "test/create_test_field_trials.h" @@ -137,7 +136,7 @@ class VideoTraits : public Traits<webrtc::VideoChannel, // Base class for Voice/Video tests template <class T> -class ChannelTest : public ::testing::Test, public sigslot::has_slots<> { +class ChannelTest : public ::testing::Test { public: enum Flags { RTCP_MUX = 0x1, diff --git a/third_party/libwebrtc/pc/dtls_srtp_transport_unittest.cc b/third_party/libwebrtc/pc/dtls_srtp_transport_unittest.cc @@ -32,7 +32,6 @@ #include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/rtc_certificate.h" #include "rtc_base/ssl_identity.h" -#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" #include "test/create_test_field_trials.h" #include "test/gtest.h" @@ -47,8 +46,7 @@ using ::webrtc::SrtpTransport; constexpr int kRtpAuthTagLen = 10; -class DtlsSrtpTransportTest : public ::testing::Test, - public sigslot::has_slots<> { +class DtlsSrtpTransportTest : public ::testing::Test { protected: DtlsSrtpTransportTest() {} diff --git a/third_party/libwebrtc/pc/jsep_transport_unittest.cc b/third_party/libwebrtc/pc/jsep_transport_unittest.cc @@ -52,7 +52,6 @@ #include "rtc_base/ssl_fingerprint.h" #include "rtc_base/ssl_identity.h" #include "rtc_base/ssl_stream_adapter.h" -#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" #include "test/create_test_field_trials.h" #include "test/gtest.h" @@ -96,7 +95,7 @@ scoped_refptr<IceTransportInterface> CreateIceTransport( return make_ref_counted<FakeIceTransportWrapper>(std::move(internal)); } -class JsepTransport2Test : public ::testing::Test, public sigslot::has_slots<> { +class JsepTransport2Test : public ::testing::Test { protected: std::unique_ptr<SrtpTransport> CreateSdesTransport( PacketTransportInternal* rtp_packet_transport, diff --git a/third_party/libwebrtc/pc/srtp_transport_unittest.cc b/third_party/libwebrtc/pc/srtp_transport_unittest.cc @@ -29,7 +29,6 @@ #include "rtc_base/containers/flat_set.h" #include "rtc_base/copy_on_write_buffer.h" #include "rtc_base/ssl_stream_adapter.h" -#include "rtc_base/third_party/sigslot/sigslot.h" #include "test/create_test_field_trials.h" #include "test/gtest.h" @@ -49,7 +48,7 @@ static const ZeroOnFreeBuffer<uint8_t> kTestKeyGcm256_1{ static const ZeroOnFreeBuffer<uint8_t> kTestKeyGcm256_2{ "rqponmlkjihgfedcbaZYXWVUTSRQPONMLKJIHGFEDCBA", 44}; -class SrtpTransportTest : public ::testing::Test, public sigslot::has_slots<> { +class SrtpTransportTest : public ::testing::Test { protected: SrtpTransportTest() { bool rtcp_mux_enabled = true; diff --git a/third_party/libwebrtc/rtc_base/thread_unittest.cc b/third_party/libwebrtc/rtc_base/thread_unittest.cc @@ -36,7 +36,6 @@ #include "rtc_base/socket_address.h" #include "rtc_base/socket_server.h" #include "rtc_base/synchronization/mutex.h" -#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread_annotations.h" #include "rtc_base/time_utils.h" #include "test/gmock.h" @@ -87,7 +86,7 @@ class MessageClient : public TestGenerator { }; // Receives on a socket and sends by posting messages. -class SocketClient : public TestGenerator, public sigslot::has_slots<> { +class SocketClient : public TestGenerator { public: SocketClient(Socket* socket, const SocketAddress& addr, @@ -102,7 +101,7 @@ class SocketClient : public TestGenerator, public sigslot::has_slots<> { }); } - ~SocketClient() override { delete socket_; } + ~SocketClient() { delete socket_; } SocketAddress address() const { return socket_->GetLocalAddress(); } diff --git a/third_party/libwebrtc/rtc_base/virtual_socket_unittest.cc b/third_party/libwebrtc/rtc_base/virtual_socket_unittest.cc @@ -31,7 +31,6 @@ #include "rtc_base/task_utils/repeating_task.h" #include "rtc_base/test_client.h" #include "rtc_base/test_utils.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" @@ -85,7 +84,7 @@ struct Sender { char dummy[4096]; }; -struct Receiver : public sigslot::has_slots<> { +struct Receiver { Receiver(Thread* th, Socket* s, uint32_t bw) : thread(th), socket(std::make_unique<AsyncUDPSocket>(s)), @@ -111,7 +110,7 @@ struct Receiver : public sigslot::has_slots<> { }); } - ~Receiver() override { periodic.Stop(); } + ~Receiver() { periodic.Stop(); } void OnReadPacket(AsyncPacketSocket* s, const ReceivedIpPacket& packet) { ASSERT_EQ(socket.get(), s);