Landing Recent QUIC changes until Sun May 8 00:39:29 2016 +0000

net/quic/quic_session.cc

Index: net/quic/quic_session.cc
diff --git a/net/quic/quic_session.cc b/net/quic/quic_session.cc
index c6cf09bab2f560cceaf73713a9dd99d72c4f77e6..542b518f29fab8d9ed9b2883f4efb440fd797d89 100644
--- a/net/quic/quic_session.cc
+++ b/net/quic/quic_session.cc
@@ -83,7 +83,7 @@ void QuicSession::OnStreamFrame(const QuicStreamFrame& frame) {
     // final stream byte offset sent by the peer. A frame with a FIN can give
     // us this offset.
     if (frame.fin) {
-      QuicStreamOffset final_byte_offset = frame.offset + frame.frame_length;
+      QuicStreamOffset final_byte_offset = frame.offset + frame.data_length;
       UpdateFlowControlOnFinalReceivedByteOffset(stream_id, final_byte_offset);
     }
     return;