Re-enabling socket tests that were previously flaky. It's assumed that these tests were flaky because they used a non-virtual resource (sockets) and were being run in parallel. So this should be fixed now that these tests are now not being run in parallel, thanks to this CL: https://codereview.webrtc.org/1426643003 BUG=webrtc:4923 R=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/1982733002 . Cr-Commit-Position: refs/heads/master@{#12817}
diff --git a/webrtc/base/messagequeue.cc b/webrtc/base/messagequeue.cc index e8b5bf5..84fdaf1 100644 --- a/webrtc/base/messagequeue.cc +++ b/webrtc/base/messagequeue.cc
@@ -345,7 +345,7 @@ uint32_t id, MessageData* pdata) { // This should work even if it is used (unexpectedly). - int delay = static_cast<uint32_t>(TimeMillis()) - tstamp; + int64_t delay = static_cast<uint32_t>(TimeMillis()) - tstamp; return DoDelayPost(delay, tstamp, phandler, id, pdata); } @@ -356,13 +356,14 @@ return DoDelayPost(TimeUntil(tstamp), tstamp, phandler, id, pdata); } -void MessageQueue::DoDelayPost(int cmsDelay, +void MessageQueue::DoDelayPost(int64_t cmsDelay, int64_t tstamp, MessageHandler* phandler, uint32_t id, MessageData* pdata) { - if (fStop_) + if (fStop_) { return; + } // Keep thread safe // Add to the priority queue. Gets sorted soonest first.