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

net/tools/quic/test_tools/simple_client.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_TOOLS_QUIC_TEST_TOOLS_SIMPLE_CLIENT_H_
 #define NET_TOOLS_QUIC_TEST_TOOLS_SIMPLE_CLIENT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 43 matching lines @@
   virtual void WaitForInitialResponse();
 
   // Returns once a complete response or a connection close has been received
   // from the server, or once the timeout expires. -1 for no timeout.
   virtual void WaitForResponseForMs(int timeout_ms);
 
   // Waits for some data or response from the server, or once the timeout
   // 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;
 
   // Closes and reopens the connection to the server.
   virtual void ResetConnection() = 0;
 
   // Closes the connection to the server.
   virtual void Disconnect() = 0;
 
@@ skipping 81 matching lines @@
 
   // Instructs the client to populate response_body().
   virtual bool buffer_body() const = 0;
   virtual void set_buffer_body(bool buffer_body) = 0;
 };
 
 }  // namespace test
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_TEST_TOOLS_SIMPLE_CLIENT_H_