Landing Recent QUIC changes until 3:24 PM, Oct 01, 2016 UTC-4

net/tools/quic/quic_spdy_client_stream.cc

 // 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.
 
 #include "net/tools/quic/quic_spdy_client_stream.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 85 matching lines @@
   DVLOG(1) << "headers complete for stream " << id();
 
   session_->OnInitialHeadersComplete(id(), response_headers_);
 }
 
 void QuicSpdyClientStream::OnTrailingHeadersComplete(
     bool fin,
     size_t frame_len,
     const QuicHeaderList& header_list) {
   QuicSpdyStream::OnTrailingHeadersComplete(fin, frame_len, header_list);
-  MarkTrailersConsumed(decompressed_trailers().length());
+  MarkTrailersConsumed();
 }
 
 void QuicSpdyClientStream::OnPromiseHeadersComplete(QuicStreamId promised_id,
                                                     size_t frame_len) {
   header_bytes_read_ += frame_len;
   int64_t content_length = -1;
   SpdyHeaderBlock promise_headers;
   if (!SpdyUtils::ParseHeaders(decompressed_headers().data(),
                                decompressed_headers().length(), &content_length,
                                &promise_headers)) {
@@ skipping 73 matching lines @@
   bytes_sent += header_bytes_written_;
 
   if (!body.empty()) {
     WriteOrBufferData(body, fin, nullptr);
   }
 
   return bytes_sent;
 }
 
 }  // namespace net