Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/tools/quic/test_tools/quic_test_client.cc

Index: net/tools/quic/test_tools/quic_test_client.cc
diff --git a/net/tools/quic/test_tools/quic_test_client.cc b/net/tools/quic/test_tools/quic_test_client.cc
index e58916b0ee50e81677712e593fe8f8a2d0184a24..c8abbbfe25e8c26edee1be4a6d35f07ca1e55bbd 100644
--- a/net/tools/quic/test_tools/quic_test_client.cc
+++ b/net/tools/quic/test_tools/quic_test_client.cc
@@ -570,7 +570,7 @@ bool QuicTestClient::HaveActiveStream() {
           !client_->session()->IsClosedStream(stream_->id()));
 }
 
-void QuicTestClient::WaitUntil(int timeout_ms, std::function<bool()> trigger) {
+bool QuicTestClient::WaitUntil(int timeout_ms, std::function<bool()> trigger) {
   int64_t timeout_us = timeout_ms * base::Time::kMicrosecondsPerMillisecond;
   int64_t old_timeout_us = epoll_server()->timeout_in_us();
   if (timeout_us > 0) {
@@ -590,7 +590,9 @@ void QuicTestClient::WaitUntil(int timeout_ms, std::function<bool()> trigger) {
   }
   if (trigger && !trigger()) {
     VLOG(1) << "Client WaitUntil returning with trigger returning false.";
+    return false;
   }
+  return true;
 }
 
 ssize_t QuicTestClient::Send(const void* buffer, size_t size) {