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

net/quic/core/quic_stream_sequencer.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/quic/core/quic_stream_sequencer.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <utility>
@@ skipping 124 matching lines @@
   DCHECK(!blocked_);
   return buffered_frames_.GetReadableRegion(iov, timestamp);
 }
 
 int QuicStreamSequencer::Readv(const struct iovec* iov, size_t iov_len) {
   DCHECK(!blocked_);
   string error_details;
   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);
     return static_cast<int>(bytes_read);
   }
 
   stream_->AddBytesConsumed(bytes_read);
   return static_cast<int>(bytes_read);
 }
 
@@ skipping 35 matching lines @@
   }
   ignore_read_data_ = true;
   FlushBufferedFrames();
 }
 
 void QuicStreamSequencer::ReleaseBuffer() {
   buffered_frames_.ReleaseWholeBuffer();
 }
 
 void QuicStreamSequencer::ReleaseBufferIfEmpty() {
-  if (FLAGS_quic_release_crypto_stream_buffer && buffered_frames_.Empty()) {
+  if (buffered_frames_.Empty()) {
     buffered_frames_.ReleaseWholeBuffer();
   }
 }
 
 void QuicStreamSequencer::FlushBufferedFrames() {
   DCHECK(ignore_read_data_);
   size_t bytes_flushed = buffered_frames_.FlushBufferedFrames();
   DVLOG(1) << "Flushing buffered data at offset "
            << buffered_frames_.BytesConsumed() << " length " << bytes_flushed
            << " for stream " << stream_->id();
@@ skipping 15 matching lines @@
          "\n  bytes buffered: " + IntToString(NumBytesBuffered()) +
          "\n  bytes consumed: " + IntToString( NumBytesConsumed()) +
          "\n  has bytes to read: " +  (HasBytesToRead() ? "true" : "false") +
          "\n  frames received: " + IntToString(num_frames_received()) +
          "\n  close offset bytes: " + IntToString( close_offset_) +
          "\n  is closed: " + (IsClosed() ? "true" : "false");
   // clang-format on
 }
 
 }  // namespace net