Landing recent QUIC changes until 7:19 PM, Feb 26, 2016 UTC-5.

net/quic/quic_spdy_stream.cc

 // Copyright 2013 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/quic/quic_spdy_stream.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_bug_tracker.h"
 #include "net/quic/quic_spdy_session.h"
@@ skipping 61 matching lines @@
     // TODO(rch): Add test to ensure fin_sent_ is set whenever a fin is sent.
     set_fin_sent(true);
     CloseWriteSide();
   }
   return bytes_written;
 }
 
 size_t QuicSpdyStream::WriteTrailers(
     SpdyHeaderBlock trailer_block,
     QuicAckListenerInterface* ack_notifier_delegate) {
-  if (!FLAGS_quic_supports_trailers) {
-    return 0;
-  }
   if (fin_sent()) {
     QUIC_BUG << "Trailers cannot be sent after a FIN.";
     return 0;
   }
 
   // The header block must contain the final offset for this stream, as the
   // trailers may be processed out of order at the peer.
   trailer_block.insert(std::make_pair(
       kFinalOffsetHeaderKey,
       base::IntToString(stream_bytes_written() + queued_data_bytes())));
@@ skipping 32 matching lines @@
 bool QuicSpdyStream::IsDoneReading() const {
   bool done_reading_headers = FinishedReadingHeaders();
   bool done_reading_body = sequencer()->IsClosed();
   bool done_reading_trailers = FinishedReadingTrailers();
   return done_reading_headers && done_reading_body && done_reading_trailers;
 }
 
 bool QuicSpdyStream::HasBytesToRead() const {
   bool headers_to_read = !decompressed_headers_.empty();
   bool body_to_read = sequencer()->HasBytesToRead();
-  bool trailers_to_read =
-      (FLAGS_quic_supports_trailers && !decompressed_trailers_.empty());
+  bool trailers_to_read = !decompressed_trailers_.empty();
   return headers_to_read || body_to_read || trailers_to_read;
 }
 
 void QuicSpdyStream::MarkHeadersConsumed(size_t bytes_consumed) {
   decompressed_headers_.erase(0, bytes_consumed);
   if (FinishedReadingHeaders()) {
     sequencer()->SetUnblocked();
   }
 }
 
 void QuicSpdyStream::MarkTrailersConsumed(size_t bytes_consumed) {
   decompressed_trailers_.erase(0, bytes_consumed);
 }
 
 void QuicSpdyStream::SetPriority(SpdyPriority priority) {
   DCHECK_EQ(0u, stream_bytes_written());
   spdy_session_->UpdateStreamPriority(id(), priority);
   priority_ = priority;
 }
 
 void QuicSpdyStream::OnStreamHeaders(StringPiece headers_data) {
-  if (!FLAGS_quic_supports_trailers || !headers_decompressed_) {
+  if (!headers_decompressed_) {
     headers_data.AppendToString(&decompressed_headers_);
   } else {
     DCHECK(!trailers_decompressed_);
     headers_data.AppendToString(&decompressed_trailers_);
   }
 }
 
 void QuicSpdyStream::OnStreamHeadersPriority(SpdyPriority priority) {
   DCHECK_EQ(Perspective::IS_SERVER, session()->connection()->perspective());
   SetPriority(priority);
 }
 
 void QuicSpdyStream::OnStreamHeadersComplete(bool fin, size_t frame_len) {
-  if (!FLAGS_quic_supports_trailers || !headers_decompressed_) {
+  if (!headers_decompressed_) {
     OnInitialHeadersComplete(fin, frame_len);
   } else {
     OnTrailingHeadersComplete(fin, frame_len);
   }
 }
 
 void QuicSpdyStream::OnInitialHeadersComplete(bool fin, size_t /*frame_len*/) {
   headers_decompressed_ = true;
   if (fin) {
     OnStreamFrame(QuicStreamFrame(id(), fin, 0, StringPiece()));
@@ skipping 59 matching lines @@
     visitor_ = nullptr;
     visitor->OnClose(this);
   }
 }
 
 bool QuicSpdyStream::FinishedReadingHeaders() const {
   return headers_decompressed_ && decompressed_headers_.empty();
 }
 
 bool QuicSpdyStream::FinishedReadingTrailers() const {
-  if (!FLAGS_quic_supports_trailers) {
-    return true;
-  }
   // If no further trailing headers are expected, and the decompressed trailers
   // (if any) have been consumed, then reading of trailers is finished.
   bool no_more_trailers = fin_received() || trailers_decompressed_;
   return no_more_trailers && decompressed_trailers_.empty();
 }
 
 SpdyPriority QuicSpdyStream::priority() const {
   return priority_;
 }
 }  // namespace net