Land Recent QUIC Changes.

Remove QUIC's accummulated_number_of_lost_packets from the TCP and
InterArrival congestion feedback frames.

This is part of the migration to version 15, and removes a field which
was intended to be used by FEC, but never set to a non-zero value
previously due to a bug in the code.

Merge internal change: 60948757
https://codereview.chromium.org/155723002/


Add stats for lost and spuriously retransmitted packets to
QuicConnectionStats.

Merge internal change: 60932905
https://codereview.chromium.org/149793004/


The MOCK_METHODx usages removed in this CL try to mock either a
non-virtual or not existing method and are thus never called.

Please look carefully at each deletion. Instead of deleting, the right
fix might be:
- Fix spelling or signature to actually overwrite a method in the base
  class
- Make the method in the base class virtual
- This is a currently unused mock intended to mock a non-virtual method
  via template injection and it should be left alone

Merge internal change: 60910454
https://codereview.chromium.org/153093006/


Cleanup: Remove inclusion of base/scoped_ptr.h in files which don't use
scoped_ptr.  Testing ensures that these inclusions don't have transitive
dependencies.

Merge internal change: 60858913
https://codereview.chromium.org/155683002/


Change QUIC's GetRetransmissionDelay() to exponentially back off from
the minimum value, instead of using the minimum multiple times.

Merge internal change: 60782771
https://codereview.chromium.org/155673002/


QUIC_VERSION_14 introduced. Add byte_offset to RST_STREAM_FRAME, add
version checks for WINDOW_UPDATE and BLOCKED frames. None of these
additions used yet.

Merge internal change: 60780039
https://codereview.chromium.org/155623003/


(minor) QUIC: Initialize members in QUIC frame constructors.

Merge internal change: 60677390
https://codereview.chromium.org/150663004/


Add WINDOW_UPDATE and BLOCKED frames to QUIC. Not yet used.

Adds the frame types, and matching framer methods for reading/writing
them. The framer visitor methods to handle the new frames just return
true and ignore them for now.

Merge internal change: 60646513
https://codereview.chromium.org/130463004/


QUIC cleanup to remove the helper which provided
GetNextPacketSequenceNumber to QuicSentPacketManager and instead let the
connection use that information directly.

Merge internal change: 60587367
https://codereview.chromium.org/132503007/

R=rch@chromium.org

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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc
index b9c3a77..fd32984 100644
--- a/net/quic/reliable_quic_stream.cc
+++ b/net/quic/reliable_quic_stream.cc
@@ -101,7 +101,7 @@ void ReliableQuicStream::Reset(QuicRstStreamErrorCode error) {
   DCHECK_NE(QUIC_STREAM_NO_ERROR, error);
   stream_error_ = error;
   // Sending a RstStream results in calling CloseStream.
-  session()->SendRstStream(id(), error);
+  session()->SendRstStream(id(), error, stream_bytes_written_);
 }
 
 void ReliableQuicStream::CloseConnection(QuicErrorCode error) {