Land Recent QUIC Changes.

net/tools/quic/test_tools/quic_test_client.cc

 // 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.
 
 #include "net/tools/quic/test_tools/quic_test_client.h"
 
 #include "base/time/time.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/cert/cert_verify_result.h"
@@ skipping 247 matching lines @@
                                           secure_));
   ssize_t ret = GetOrCreateStream()->SendRequest(
       munged_headers.get() ? *munged_headers.get() : *message.headers(),
       message.body(),
       message.has_complete_message());
   WaitForWriteToFlush();
   return ret;
 }
 
 ssize_t QuicTestClient::SendData(string data, bool last_data) {
+  return SendData(data, last_data, nullptr);
+}
+
+ssize_t QuicTestClient::SendData(string data,
+                                 bool last_data,
+                                 QuicAckNotifier::DelegateInterface* delegate) {
   QuicSpdyClientStream* stream = GetOrCreateStream();
   if (!stream) { return 0; }
-  GetOrCreateStream()->SendBody(data, last_data);
+  GetOrCreateStream()->SendBody(data, last_data, delegate);
   WaitForWriteToFlush();
   return data.length();
 }
 
 bool QuicTestClient::response_complete() const {
   return response_complete_;
 }
 
 int QuicTestClient::response_header_size() const {
   return response_header_size_;
@@ skipping 270 matching lines @@
   // Set policy for headers and crypto streams.
   ReliableQuicStreamPeer::SetFecPolicy(
       QuicSessionPeer::GetHeadersStream(client()->session()), fec_policy);
   ReliableQuicStreamPeer::SetFecPolicy(client()->session()->GetCryptoStream(),
                                        fec_policy);
 }
 
 }  // namespace test
 }  // namespace tools
 }  // namespace net