Land Recent QUIC Changes.

net/quic/reliable_quic_stream.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.
 //
 // The base class for client/server reliable streams.
 
 #ifndef NET_QUIC_RELIABLE_QUIC_STREAM_H_
 #define NET_QUIC_RELIABLE_QUIC_STREAM_H_
 
 #include <sys/types.h>
 
 #include <list>
 
 #include "base/strings/string_piece.h"
 #include "net/base/iovec.h"
 #include "net/base/net_export.h"
+#include "net/quic/quic_ack_notifier.h"
 #include "net/quic/quic_spdy_compressor.h"
 #include "net/quic/quic_spdy_decompressor.h"
 #include "net/quic/quic_stream_sequencer.h"
 
 namespace net {
 
 namespace test {
 class ReliableQuicStreamPeer;
 }  // namespace test
 
@@ skipping 138 matching lines @@
   // Returns (data.size(), true) as it always consumed all data: it returns for
   // convenience to have the same return type as WriteDataInternal.
   QuicConsumedData WriteOrBuffer(base::StringPiece data, bool fin);
 
   // Sends as much of 'data' to the connection as the connection will consume.
   // Returns the number of bytes consumed by the connection.
   QuicConsumedData WriteDataInternal(base::StringPiece data, bool fin);
 
   // Sends as many bytes in the first |count| buffers of |iov| to the connection
   // as the connection will consume.
+  // If |ack_notifier_delegate| is provided, then it will be notified once all
+  // the ACKs for this write have been received.
   // Returns the number of bytes consumed by the connection.
-  QuicConsumedData WritevDataInternal(const struct iovec* iov,
-                                      int iov_count,
-                                      bool fin);
+  QuicConsumedData WritevDataInternal(
+      const struct iovec* iov,
+      int iov_count,
+      bool fin,
+      QuicAckNotifier::DelegateInterface* ack_notifier_delegate);
 
  private:
   friend class test::ReliableQuicStreamPeer;
   friend class QuicStreamUtils;
 
   uint32 StripPriorityAndHeaderId(const char* data, uint32 data_len);
 
   std::list<string> queued_data_;
 
   QuicStreamSequencer sequencer_;
@@ skipping 38 matching lines @@
   bool fin_buffered_;
   bool fin_sent_;
 
   // True if the session this stream is running under is a server session.
   bool is_server_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_RELIABLE_QUIC_STREAM_H_