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

net/quic/core/quic_stream_sequencer_buffer_test.cc

 // Copyright (c) 2015 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_buffer.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 119 matching lines @@
   EXPECT_EQ(1824u, gaps.back().begin_offset);
   auto* frame_map = helper_->frame_arrival_time_map();
   EXPECT_EQ(1u, frame_map->size());
   EXPECT_EQ(800u, frame_map->begin()->first);
   EXPECT_EQ(t, (*frame_map)[800].timestamp);
   EXPECT_TRUE(helper_->CheckBufferInvariants());
   EXPECT_TRUE(helper_->IsBufferAllocated());
 }
 
 TEST_F(QuicStreamSequencerBufferTest, OnStreamDataInvalidSource) {
-  FLAGS_quic_stream_sequencer_buffer_debug = true;
   // Pass in an invalid source, expects to return error.
   StringPiece source;
   source.set(nullptr, 1024);
   size_t written;
   clock_.AdvanceTime(QuicTime::Delta::FromSeconds(1));
   QuicTime t = clock_.ApproximateNow();
   EXPECT_EQ(QUIC_STREAM_SEQUENCER_INVALID_STATE,
             buffer_->OnStreamData(800, source, t, &written, &error_details_));
   EXPECT_EQ(
       0u, error_details_.find("QuicStreamSequencerBuffer error: OnStreamData()"
@@ skipping 178 matching lines @@
   EXPECT_EQ(100u, read);
   EXPECT_EQ(100u, buffer_->BytesConsumed());
   EXPECT_EQ(source, string(dest, read));
   EXPECT_EQ(1u, helper_->frame_arrival_time_map()->size());
   // The first block should be released as its data has been read out.
   EXPECT_EQ(nullptr, helper_->GetBlock(0));
   EXPECT_TRUE(helper_->CheckBufferInvariants());
 }
 
 TEST_F(QuicStreamSequencerBufferTest, ReadvError) {
-  FLAGS_quic_stream_sequencer_buffer_debug = true;
   string source = string(100, 'b');
   clock_.AdvanceTime(QuicTime::Delta::FromSeconds(1));
   QuicTime t1 = clock_.ApproximateNow();
   // Write something into [0, 100).
   size_t written;
   buffer_->OnStreamData(0, source, t1, &written, &error_details_);
   EXPECT_TRUE(helper_->GetBlock(0) != nullptr);
   EXPECT_TRUE(buffer_->HasBytesToRead());
   // Read into a iovec array with total capacity of 120 bytes.
   iovec iov{nullptr, 120};
@@ skipping 706 matching lines @@
   EXPECT_LE(bytes_to_buffer_, total_bytes_read_) << "iterations: "
                                                  << iterations;
   EXPECT_LE(bytes_to_buffer_, total_bytes_written_);
 }
 
 }  // anonymous namespace
 
 }  // namespace test
 
 }  // namespace net