Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

net/quic/test_tools/quic_stream_sequencer_buffer_peer.cc

 // Copyright 2016 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/test_tools/quic_stream_sequencer_buffer_peer.h"
 
 #include "net/quic/core/quic_flags.h"
 #include "net/test/gtest_util.h"
 
 typedef net::QuicStreamSequencerBuffer::BufferBlock BufferBlock;
@@ skipping 23 matching lines @@
   return bytes_read;
 }
 
 // If buffer is empty, the blocks_ array must be empty, which means all
 // blocks are deallocated.
 bool QuicStreamSequencerBufferPeer::CheckEmptyInvariants() {
   return !buffer_->Empty() || IsBlockArrayEmpty();
 }
 
 bool QuicStreamSequencerBufferPeer::IsBlockArrayEmpty() {
-  if (FLAGS_quic_reduce_sequencer_buffer_memory_life_time &&  // NOLINT
-      buffer_->blocks_ == nullptr) {
+  if (buffer_->blocks_ == nullptr) {
     return true;
   }
 
   size_t count = buffer_->blocks_count_;
   for (size_t i = 0; i < count; i++) {
     if (buffer_->blocks_[i] != nullptr) {
       return false;
     }
   }
   return true;
@@ skipping 77 matching lines @@
 void QuicStreamSequencerBufferPeer::set_gaps(const std::list<Gap>& gaps) {
   buffer_->gaps_ = gaps;
 }
 
 bool QuicStreamSequencerBufferPeer::IsBufferAllocated() {
   return buffer_->blocks_ != nullptr;
 }
 
 }  // namespace test
 }  // namespace net