Land recent QUIC changes.

net/quic/quic_stream_sequencer_test.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/quic_stream_sequencer.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/rand_util.h"
@@ skipping 74 matching lines @@
   scoped_ptr<QuicStreamSequencerPeer> sequencer_;
 };
 
 TEST_F(QuicStreamSequencerTest, RejectOldFrame) {
   EXPECT_CALL(stream_, ProcessData(StrEq("abc"), 3))
       .WillOnce(Return(3));
 
   EXPECT_TRUE(sequencer_->OnFrame(0, "abc", 3));
   EXPECT_EQ(0u, sequencer_->frames()->size());
   EXPECT_EQ(3u, sequencer_->num_bytes_consumed());
-  // Nack this - it matches a past sequence number and we should not see it
+  // Ignore this - it matches a past sequence number and we should not see it
   // again.
-  EXPECT_FALSE(sequencer_->OnFrame(0, "def", 3));
+  EXPECT_TRUE(sequencer_->OnFrame(0, "def", 3));
   EXPECT_EQ(0u, sequencer_->frames()->size());
 }
 
 TEST_F(QuicStreamSequencerTest, RejectOverlyLargeFrame) {
   /*
   EXPECT_DFATAL(sequencer_.reset(new QuicStreamSequencerPeer(2, &stream_)),
                 "Setting max frame memory to 2.  "
                 "Some frames will be impossible to handle.");
 
   EXPECT_DEBUG_DEATH(sequencer_->OnFrame(0, "abc", 3), "");
   */
 }
 
 TEST_F(QuicStreamSequencerTest, DropFramePastBuffering) {
   sequencer_->SetMemoryLimit(3);
 
   EXPECT_FALSE(sequencer_->OnFrame(3, "abc", 3));
 }
 
 TEST_F(QuicStreamSequencerTest, RejectBufferedFrame) {
   EXPECT_CALL(stream_, ProcessData(StrEq("abc"), 3));
 
   EXPECT_TRUE(sequencer_->OnFrame(0, "abc", 3));
   EXPECT_EQ(1u, sequencer_->frames()->size());
   EXPECT_EQ(0u, sequencer_->num_bytes_consumed());
   // Ignore this - it matches a buffered frame.
   // Right now there's no checking that the payload is consistent.
-  EXPECT_FALSE(sequencer_->OnFrame(0, "def", 3));
+  EXPECT_TRUE(sequencer_->OnFrame(0, "def", 3));
   EXPECT_EQ(1u, sequencer_->frames()->size());
 }
 
 TEST_F(QuicStreamSequencerTest, FullFrameConsumed) {
   EXPECT_CALL(stream_, ProcessData(StrEq("abc"), 3)).WillOnce(Return(3));
 
   EXPECT_TRUE(sequencer_->OnFrame(0, "abc", 3));
   EXPECT_EQ(0u, sequencer_->frames()->size());
   EXPECT_EQ(3u, sequencer_->num_bytes_consumed());
 }
@@ skipping 263 matching lines @@
         list_[index].second.size());
     if (acked) {
       list_.erase(list_.begin() + index);
     }
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net