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}
diff --git a/pc/channel_unittest.cc b/pc/channel_unittest.cc
index ce4b6dd..f4cf34f 100644
--- a/pc/channel_unittest.cc
+++ b/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 @@
// 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/pc/dtls_srtp_transport_unittest.cc b/pc/dtls_srtp_transport_unittest.cc
index 40108df..bc69202 100644
--- a/pc/dtls_srtp_transport_unittest.cc
+++ b/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 @@
constexpr int kRtpAuthTagLen = 10;
-class DtlsSrtpTransportTest : public ::testing::Test,
- public sigslot::has_slots<> {
+class DtlsSrtpTransportTest : public ::testing::Test {
protected:
DtlsSrtpTransportTest() {}
diff --git a/pc/jsep_transport_unittest.cc b/pc/jsep_transport_unittest.cc
index 48a4147..121f953 100644
--- a/pc/jsep_transport_unittest.cc
+++ b/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 @@
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/pc/srtp_transport_unittest.cc b/pc/srtp_transport_unittest.cc
index 6de46be..d2810fe 100644
--- a/pc/srtp_transport_unittest.cc
+++ b/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_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/rtc_base/thread_unittest.cc b/rtc_base/thread_unittest.cc
index c01e42a..03b28b9 100644
--- a/rtc_base/thread_unittest.cc
+++ b/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 @@
};
// 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 @@
});
}
- ~SocketClient() override { delete socket_; }
+ ~SocketClient() { delete socket_; }
SocketAddress address() const { return socket_->GetLocalAddress(); }
diff --git a/rtc_base/virtual_socket_unittest.cc b/rtc_base/virtual_socket_unittest.cc
index 5d6a1e0..bfa20a9 100644
--- a/rtc_base/virtual_socket_unittest.cc
+++ b/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 @@
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 @@
});
}
- ~Receiver() override { periodic.Stop(); }
+ ~Receiver() { periodic.Stop(); }
void OnReadPacket(AsyncPacketSocket* s, const ReceivedIpPacket& packet) {
ASSERT_EQ(socket.get(), s);
