Land Recent QUIC Changes.

net/quic/congestion_control/hybrid_slow_start_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 "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/congestion_control/hybrid_slow_start.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 35 matching lines @@
   slow_start_->StartReceiveRound(end_sequence_number);
   while (sequence_number < end_sequence_number) {
     EXPECT_FALSE(slow_start_->IsEndOfRound(sequence_number++));
   }
   EXPECT_TRUE(slow_start_->IsEndOfRound(sequence_number++));
 }
 
 // TODO(ianswett): Add tests which more realistically invoke the methods,
 // simulating how actual acks arrive and packets are sent.
 TEST_F(HybridSlowStartTest, AckTrain) {
-  // At a typical RTT 60 ms, assuming that the inter arrival is 1 ms,
+  // At a typical RTT 60 ms, assuming that the inter arrival timestamp is 1 ms,
   // we expect to be able to send a burst of 30 packet before we trigger the
   // ack train detection.
   const int kMaxLoopCount = 5;
   QuicPacketSequenceNumber sequence_number = 2;
   QuicPacketSequenceNumber end_sequence_number = 2;
   for (int burst = 0; burst < kMaxLoopCount; ++burst) {
     slow_start_->StartReceiveRound(end_sequence_number);
     do {
       clock_.AdvanceTime(one_ms_);
       EXPECT_FALSE(slow_start_->ShouldExitSlowStart(rtt_, rtt_, 100));
@@ skipping 31 matching lines @@
         rtt_.Add(QuicTime::Delta::FromMilliseconds(n + 5)), rtt_, 100));
   }
   // Expect to trigger since all packets in this burst was above the long term
   // RTT provided.
   EXPECT_TRUE(slow_start_->ShouldExitSlowStart(
       rtt_.Add(QuicTime::Delta::FromMilliseconds(5)), rtt_, 100));
 }
 
 }  // namespace test
 }  // namespace net