diff --git a/examples/unityplugin/simple_peer_connection.cc b/examples/unityplugin/simple_peer_connection.cc index 536bf86a01..ed89489e8e 100644 --- a/examples/unityplugin/simple_peer_connection.cc +++ b/examples/unityplugin/simple_peer_connection.cc @@ -122,9 +122,9 @@ bool SimplePeerConnection::InitializePeerConnection(const char** turn_urls, RTC_DCHECK(peer_connection_.get() == nullptr); if (g_peer_connection_factory == nullptr) { - g_worker_thread.reset(new rtc::Thread()); + g_worker_thread = rtc::Thread::Create(); g_worker_thread->Start(); - g_signaling_thread.reset(new rtc::Thread()); + g_signaling_thread = rtc::Thread::Create(); g_signaling_thread->Start(); g_peer_connection_factory = webrtc::CreatePeerConnectionFactory( diff --git a/rtc_base/signal_thread_unittest.cc b/rtc_base/signal_thread_unittest.cc index c333ff7a62..f03991bf86 100644 --- a/rtc_base/signal_thread_unittest.cc +++ b/rtc_base/signal_thread_unittest.cc @@ -10,10 +10,11 @@ #include +#include "absl/memory/memory.h" #include "rtc_base/constructor_magic.h" #include "rtc_base/gunit.h" +#include "rtc_base/null_socket_server.h" #include "rtc_base/signal_thread.h" -#include "rtc_base/socket_server.h" #include "rtc_base/thread.h" #include "test/gtest.h" @@ -129,7 +130,9 @@ class SignalThreadTest : public ::testing::Test, public sigslot::has_slots<> { class OwnerThread : public Thread, public sigslot::has_slots<> { public: explicit OwnerThread(SignalThreadTest* harness) - : harness_(harness), has_run_(false) {} + : Thread(absl::make_unique()), + harness_(harness), + has_run_(false) {} ~OwnerThread() override { Stop(); } diff --git a/rtc_base/thread.cc b/rtc_base/thread.cc index 936871c40c..be0d15da4a 100644 --- a/rtc_base/thread.cc +++ b/rtc_base/thread.cc @@ -155,9 +155,6 @@ Thread::ScopedDisallowBlockingCalls::~ScopedDisallowBlockingCalls() { thread_->SetAllowBlockingCalls(previous_state_); } -// DEPRECATED. -Thread::Thread() : Thread(SocketServer::CreateDefault()) {} - Thread::Thread(SocketServer* ss) : Thread(ss, /*do_init=*/true) {} Thread::Thread(std::unique_ptr ss) diff --git a/rtc_base/thread.h b/rtc_base/thread.h index 80720e0794..738a243c03 100644 --- a/rtc_base/thread.h +++ b/rtc_base/thread.h @@ -128,13 +128,6 @@ class Runnable { class RTC_LOCKABLE Thread : public MessageQueue { public: - // DEPRECATED. - // The default constructor should not be used because it hides whether or - // not a socket server will be associated with the thread. Most instances - // of Thread do actually not need one, so please use either of the Create* - // methods to construct an instance of Thread. - Thread(); - explicit Thread(SocketServer* ss); explicit Thread(std::unique_ptr ss); // Constructors meant for subclasses; they should call DoInit themselves and diff --git a/rtc_base/thread_unittest.cc b/rtc_base/thread_unittest.cc index 800f1b1dc3..c4b6143ee0 100644 --- a/rtc_base/thread_unittest.cc +++ b/rtc_base/thread_unittest.cc @@ -10,6 +10,7 @@ #include +#include "absl/memory/memory.h" #include "rtc_base/async_invoker.h" #include "rtc_base/async_udp_socket.h" #include "rtc_base/event.h" @@ -513,7 +514,7 @@ TEST_F(AsyncInvokeTest, KillInvokerDuringExecuteWithReentrantInvoke) { bool reentrant_functor_run = false; Thread* main = Thread::Current(); - Thread thread; + Thread thread(absl::make_unique()); thread.Start(); { AsyncInvoker invoker;