Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/quic/core/quic_stream_sequencer.cc

Index: net/quic/core/quic_stream_sequencer.cc
diff --git a/net/quic/core/quic_stream_sequencer.cc b/net/quic/core/quic_stream_sequencer.cc
index 597244b5436ddef4c2184922947d3699c593c89c..dc9193731bc9cf91cc8f6654dd68344fabcf1438 100644
--- a/net/quic/core/quic_stream_sequencer.cc
+++ b/net/quic/core/quic_stream_sequencer.cc
@@ -142,7 +142,7 @@ int QuicStreamSequencer::Readv(const struct iovec* iov, size_t iov_len) {
   size_t bytes_read;
   QuicErrorCode read_error =
       buffered_frames_.Readv(iov, iov_len, &bytes_read, &error_details);
-  if (FLAGS_quic_stream_sequencer_buffer_debug && read_error != QUIC_NO_ERROR) {
+  if (read_error != QUIC_NO_ERROR) {
     string details = StringPrintf("Stream %" PRIu32 ": %s", stream_->id(),
                                   error_details.c_str());
     stream_->CloseConnectionWithDetails(read_error, details);
@@ -198,7 +198,7 @@ void QuicStreamSequencer::ReleaseBuffer() {
 }
 
 void QuicStreamSequencer::ReleaseBufferIfEmpty() {
-  if (FLAGS_quic_release_crypto_stream_buffer && buffered_frames_.Empty()) {
+  if (buffered_frames_.Empty()) {
     buffered_frames_.ReleaseWholeBuffer();
   }
 }