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

net/tools/quic/test_tools/quic_test_client.h

 // Copyright (c) 2012 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_QUIC_TEST_CLIENT_H_
 #define NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 122 matching lines @@
   void SendRequestsAndWaitForResponses(
       const std::vector<std::string>& url_list);
   ssize_t SendMessage(const HTTPMessage& message) override;
   std::string SendCustomSynchronousRequest(const HTTPMessage& message) override;
   std::string SendSynchronousRequest(const std::string& uri) override;
   void Connect() override;
   void ResetConnection() override;
   void Disconnect() override;
   IPEndPoint local_address() const override;
   void ClearPerRequestState() override;
-  void WaitUntil(int timeout_ms, std::function<bool()> trigger) override;
+  bool WaitUntil(int timeout_ms, std::function<bool()> trigger) override;
   ssize_t Send(const void* buffer, size_t size) override;
   bool response_complete() const override;
   bool response_headers_complete() const override;
   const BalsaHeaders* response_headers() const override;
   int64_t response_size() const override;
   int response_header_size() const override;
   int64_t response_body_size() const override;
   size_t bytes_read() const override;
   size_t bytes_written() const override;
   bool buffer_body() const override;
@@ skipping 169 matching lines @@
   std::string override_sni_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicTestClient);
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_CLIENT_H_