From 6eb03b81bb7736a479ad88f9c7962ea1f4ec1911 Mon Sep 17 00:00:00 2001 From: Bjorn Mellem Date: Tue, 13 Jun 2017 15:07:41 -0700 Subject: [PATCH] Remove dependency on gunit headers in virtualsocketserver. BUG=7810 Change-Id: I66d9aeaca2dd81c20f78052a15ea3680e23a1501 Reviewed-on: https://chromium-review.googlesource.com/534354 Reviewed-by: Taylor Brandstetter Commit-Queue: Taylor Brandstetter Cr-Commit-Position: refs/heads/master@{#18579} --- webrtc/base/virtualsocketserver.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webrtc/base/virtualsocketserver.cc b/webrtc/base/virtualsocketserver.cc index 95feeae49a..a7e2d30971 100644 --- a/webrtc/base/virtualsocketserver.cc +++ b/webrtc/base/virtualsocketserver.cc @@ -19,7 +19,7 @@ #include #include "webrtc/base/checks.h" -#include "webrtc/base/gunit.h" +#include "webrtc/base/fakeclock.h" #include "webrtc/base/logging.h" #include "webrtc/base/physicalsocketserver.h" #include "webrtc/base/socketaddresspair.h" @@ -648,9 +648,8 @@ bool VirtualSocketServer::ProcessMessagesUntilIdle() { while (!msg_queue_->empty()) { if (fake_clock_) { // If using a fake clock, advance it in millisecond increments until the - // queue is empty (the SIMULATED_WAIT macro ensures the queue processes - // all possible messages each time it's called). - SIMULATED_WAIT(false, 1, *fake_clock_); + // queue is empty. + fake_clock_->AdvanceTime(rtc::TimeDelta::FromMilliseconds(1)); } else { // Otherwise, run a normal message loop. Message msg;