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

net/tools/quic/test_tools/simple_client.h

Index: net/tools/quic/test_tools/simple_client.h
diff --git a/net/tools/quic/test_tools/simple_client.h b/net/tools/quic/test_tools/simple_client.h
index 68b5c897d51ccb5a2290bac7afa42cf039d4e5f4..420121549f6ab925716747501f1f1cef360a6bf0 100644
--- a/net/tools/quic/test_tools/simple_client.h
+++ b/net/tools/quic/test_tools/simple_client.h
@@ -61,7 +61,7 @@ class SimpleClient {
   // expires. -1 for no timeout.
   virtual void WaitForInitialResponseForMs(int timeout_ms);
 
-  virtual void WaitUntil(int timeout_ms, std::function<bool()> trigger) = 0;
+  virtual bool WaitUntil(int timeout_ms, std::function<bool()> trigger) = 0;
 
   // Clears any outstanding state from the last request.
   virtual void ClearPerRequestState() = 0;