Land Recent QUIC Changes.

Fix QUIC's nack counting to only increase the nack count for packets
less than the largest newly observed packet.

Reduces spurious retransmissions in the case of re-ordering.

Merge internal change: 63410263
https://codereview.chromium.org/206023002/


Removing deprecated flag FLAGs_cancel_crypto_callbacks_on_close.

Merge internal change: 63402129
https://codereview.chromium.org/205923003/


Add separate categories for retransmissions due to timeouts during
handshake and loss detection.

Merge internal change: 63287115
https://codereview.chromium.org/206003002/


Include acks for response headers sent over QUIC in faster stats RT and
loss computations.

This CL includes internals server's quic changes to allow application
code to specify a QuicAckNotifier delegate when doing buffered writes
through QUIC connection, since that is the write mechanism used by
QuicFdWrapper to write to the headers stream.

Merge internal change: 63174706
https://codereview.chromium.org/205613003/


Inform QuicAckNotifierManager about the newest sequence number that
corresponds to an acked packet, so that QUIC FasterStats RT computations
are not affected by spurious TLP retransmits.

Fix QUIC FasterStats RT reporting by considering a packet acked if any
of its retransmissions are acked.  Not flag protected.

Merge internal change: 63152079
https://codereview.chromium.org/204103004/


Merge various changes to QuicCryptoClientStream from Chrome.

Merge internal change: 63102660
https://codereview.chromium.org/199273003/


Deleting unused MarkConsumed method from QuicStreamSequencer.

Merge internal change: 63098466
https://codereview.chromium.org/200123003/

R=rch@chromium.org

Review URL: https://codereview.chromium.org/205983003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258386 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/net/quic/quic_data_stream.cc b/net/quic/quic_data_stream.cc
index c7824b4..5e0628a 100644
--- a/net/quic/quic_data_stream.cc
+++ b/net/quic/quic_data_stream.cc
@@ -43,9 +43,12 @@ QuicDataStream::QuicDataStream(QuicStreamId id,
 QuicDataStream::~QuicDataStream() {
 }
 
-size_t QuicDataStream::WriteHeaders(const SpdyHeaderBlock& header_block,
-                                    bool fin) {
-  size_t bytes_written = session()->WriteHeaders(id(), header_block, fin);
+size_t QuicDataStream::WriteHeaders(
+    const SpdyHeaderBlock& header_block,
+    bool fin,
+    QuicAckNotifier::DelegateInterface* ack_notifier_delegate) {
+  size_t bytes_written = session()->WriteHeaders(
+      id(), header_block, fin, ack_notifier_delegate);
   if (fin) {
     // TODO(rch): Add test to ensure fin_sent_ is set whenever a fin is sent.
     set_fin_sent(true);