Landing Recent QUIC changes until 06/01/2015.

Fix QUIC tests not to use stream ID 3.

Stream ID 3 is reserver for headers, but some tests were using it for data
stream. Fixed them to use stream ID 5.

relnote: test cleanup: don't use stream ID 3 for data streams in tests.

Merge internal change: 94937344
https://codereview.chromium.org/1162263010/

relnote: Added FEC send policy to send FEC packet when FEC group is
closed or when FEC timer goes off (same as the current code). This is
the default policy. Thus this change doesn't change current behavior.

Added a new policy to send FEC only when FEC timer goes off. This policy
is not enabled in the code.

When FEC group is closed (or reset) because of the new policy,
packet_generator calls delgate's OnResetFecGroup. Implementation of this
method in QuicConnection cancel's the FEC timer (because there is no FEC
packet outstanding).

Changed packet generator's unittests to run when each policy is enabled.

Merge internal change: 94774277
https://codereview.chromium.org/1145893012/

relnote:  Low risk. Add non-varz counter for CHLOs with server nonces.

Added support to the QuicCryptoServerStream for the number of
handshake messages that contain server nonces.

Previously, this class was just counting handshake messages,
irregardless of server nonces.  If encryption was established with
just one handshake message, the jetstream session would conclude this
was a 0-RTT connection.

Unfortunately, when stateless rejects come into play, the first
handshake after an SREJ will cause encryption to be established in a
single handshake.  However, this should not be counted as a 0-RTT
connection.

The solution is to separately keep track of handshake messages that
contain server nonces.  If a connection is established in one
handshake and contains a server-nonce, it is NOT a 0-RTT connection.

Added support to the crypto stream tests as well.

Merge internal change: 94767471
https://codereview.chromium.org/1158073004/

Add QUIC connection options for IW3, 20, and 50 for initial CWND
experiments.

Merge internal change: 94763199
https://codereview.chromium.org/1159113004/

relnote:  Low risk. Changed some incorrect documentation in
quic_crypto_server_config.h

The following is the internal message:

Add varz for counting crypto handshake reject messages.

Added two new varz for keeping track of REJ/SREJ messages sent.

Whenever the server processes a client hello, it now checks the crypto
result.  If the result is some kind of REJ/SREJ message, it now
increments the appropriate varz.

The tests for these varz will be included in a forthcoming CL that
includes the end_to_end_test and adds support for stateless rejects at
the server.

Changed some incorrect documentation in quic_crypto_server_config.h

Merge internal change: 94762526
https://codereview.chromium.org/1162433007/

relnote: Minor simplification of QUIC's AeadBaseDecrypter.

Made the corresponding changes from internal code to NSS and OpenSSL
implementations.

Merge internal change: 94586771
https://codereview.chromium.org/1152173016/

relnote: Merge QuicEncrypter's Encrypt into EncryptPacket and avoid an
extra allocation and copy in NullEncrypter.  No functional change.

Merge internal change: 94569655
https://codereview.chromium.org/1164803004/

relnote: Remove an unnecessary virtual method from the QuicEncrypter
interface.  No functional change.

More cleanup and optimization to follow.

Merge internal change: 94539011
https://codereview.chromium.org/1160263004/

Update quic_client_bin.cc to use the correct hostname (not IP) in the
ServerID.

Merge internal change: 94480774
https://codereview.chromium.org/1152623007/

relnote: Remove obsolete QuicStreamFrame constructor.  No functional
change.

Merge internal change: 94293525
https://codereview.chromium.org/1168443002/

relnote: Simplify the creation of QuicStreamFrame by directly
constructing the buffer and wrapping it in an IOVector.

Eliminates extra creation of temporary IOVectors and saves a copy in
GetStreamData::GetDataAsString. Estimated to save 2% of CPU.

Merge internal change: 94214497
https://codereview.chromium.org/1157403008/

R=rch@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#332769}

1 files changed, 1 insertions, 1 deletions

diff --git a/net/quic/reliable_quic_stream.cc b/net/quic/reliable_quic_stream.cc
index 54bf25e..d64f010 100644
--- a/net/quic/reliable_quic_stream.cc
+++ b/net/quic/reliable_quic_stream.cc
@@ -158,7 +158,7 @@ void ReliableQuicStream::OnStreamFrame(const QuicStreamFrame& frame) {
   }
 
   // This count includes duplicate data received.
-  size_t frame_payload_size = frame.data.TotalBufferSize();
+  size_t frame_payload_size = frame.data.size();
   stream_bytes_read_ += frame_payload_size;
 
   // Flow control is interested in tracking highest received offset.