Remove VirtualSocketServer dependency on FakeClock as unused Bug: webrtc:42223992 Change-Id: I64eced0075a54bfe20febe299e4690a07a391f31 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/476240 Auto-Submit: Danil Chapovalov <danilchap@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#47833}
diff --git a/rtc_base/virtual_socket_server.cc b/rtc_base/virtual_socket_server.cc index bbaf940..4504edb 100644 --- a/rtc_base/virtual_socket_server.cc +++ b/rtc_base/virtual_socket_server.cc
@@ -32,7 +32,6 @@ #include "rtc_base/byte_order.h" #include "rtc_base/checks.h" #include "rtc_base/event.h" -#include "rtc_base/fake_clock.h" #include "rtc_base/ip_address.h" #include "rtc_base/logging.h" #include "rtc_base/net_helpers.h" @@ -685,11 +684,8 @@ return network_size_; } -VirtualSocketServer::VirtualSocketServer() : VirtualSocketServer(nullptr) {} - -VirtualSocketServer::VirtualSocketServer(ThreadProcessingFakeClock* fake_clock) - : fake_clock_(fake_clock), - msg_queue_(nullptr), +VirtualSocketServer::VirtualSocketServer() + : msg_queue_(nullptr), stop_on_idle_(false), next_ipv4_(kInitialNextIPv4), next_ipv6_(kInitialNextIPv6), @@ -787,14 +783,7 @@ RTC_DCHECK_RUN_ON(msg_queue_); stop_on_idle_ = true; while (!msg_queue_->empty()) { - if (fake_clock_) { - // If using a fake clock, advance it in millisecond increments until the - // queue is empty. - fake_clock_->AdvanceTime(TimeDelta::Millis(1)); - } else { - // Otherwise, run a normal message loop. - msg_queue_->ProcessMessages(Thread::kForever); - } + msg_queue_->ProcessMessages(Thread::kForever); } stop_on_idle_ = false; return !msg_queue_->IsQuitting();
diff --git a/rtc_base/virtual_socket_server.h b/rtc_base/virtual_socket_server.h index ed0d07f..740bf65 100644 --- a/rtc_base/virtual_socket_server.h +++ b/rtc_base/virtual_socket_server.h
@@ -29,7 +29,6 @@ #include "api/units/time_delta.h" #include "rtc_base/callback_list.h" #include "rtc_base/event.h" -#include "rtc_base/fake_clock.h" #include "rtc_base/ip_address.h" #include "rtc_base/socket.h" #include "rtc_base/socket_address.h" @@ -232,15 +231,12 @@ class VirtualSocketServer : public SocketServer { public: VirtualSocketServer(); - // This constructor needs to be used if the test uses a fake clock and - // ProcessMessagesUntilIdle, since ProcessMessagesUntilIdle needs a way of - // advancing time. - explicit VirtualSocketServer(ThreadProcessingFakeClock* fake_clock); - ~VirtualSocketServer() override; VirtualSocketServer(const VirtualSocketServer&) = delete; VirtualSocketServer& operator=(const VirtualSocketServer&) = delete; + ~VirtualSocketServer() override; + // The default source address specifies which local address to use when a // socket is bound to the 'any' address, e.g. 0.0.0.0. (If not set, the 'any' // address is used as the source address on outgoing virtual packets, exposed @@ -458,10 +454,6 @@ typedef std::map<SocketAddress, VirtualSocket*> AddressMap; typedef std::map<SocketAddressPair, VirtualSocket*> ConnectionMap; - // May be null if the test doesn't use a fake clock, or it does but doesn't - // use ProcessMessagesUntilIdle. - ThreadProcessingFakeClock* fake_clock_ = nullptr; - // Used to implement Wait/WakeUp. Event wakeup_; Thread* msg_queue_;