Land Recent QUIC Changes.

net/quic/congestion_control/cubic_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/basictypes.h"
 #include "base/logging.h"
 #include "net/quic/congestion_control/cubic.h"
 #include "net/quic/quic_connection_stats.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 48 matching lines @@
     for (uint32 n = 1; n < current_cwnd; ++n) {
       // Call once per ACK.
       EXPECT_EQ(current_cwnd,
                 cubic_.CongestionWindowAfterAck(current_cwnd, rtt_min));
     }
     clock_.AdvanceTime(hundred_ms_);
     current_cwnd = cubic_.CongestionWindowAfterAck(current_cwnd, rtt_min);
   }
   // Total time elapsed so far; add min_rtt (0.1s) here as well.
   float elapsed_time_s = 10.0f + 0.1f;
-  // expected_cwnd is initial value of cwnd + K * t^3, where K = 0.4.
+  // |expected_cwnd| is initial value of cwnd + K * t^3, where K = 0.4.
   expected_cwnd = 11 + (elapsed_time_s * elapsed_time_s * elapsed_time_s * 410)
       / 1024;
   EXPECT_EQ(expected_cwnd, current_cwnd);
 }
 
 TEST_F(CubicTest, CwndIncreaseStatsDuringConvexRegion) {
   const QuicTime::Delta rtt_min = hundred_ms_;
   uint32 current_cwnd = 10;
   uint32 expected_cwnd = current_cwnd + 1;
   // Initialize controller state.
@@ skipping 21 matching lines @@
   for (int i = 0; i < 52; ++i) {
     for (uint32 n = 1; n < current_cwnd; ++n) {
       // Call once per ACK.
       cubic_.CongestionWindowAfterAck(current_cwnd, rtt_min);
     }
     clock_.AdvanceTime(hundred_ms_);
     current_cwnd = cubic_.CongestionWindowAfterAck(current_cwnd, rtt_min);
   }
   // Total time elapsed so far; add min_rtt (0.1s) here as well.
   float elapsed_time_s = 10.0f + 0.1f;
-  // expected_cwnd is initial value of cwnd + K * t^3, where K = 0.4.
+  // |expected_cwnd| is initial value of cwnd + K * t^3, where K = 0.4.
   expected_cwnd = 11 + (elapsed_time_s * elapsed_time_s * elapsed_time_s * 410)
       / 1024;
   EXPECT_EQ(expected_cwnd - old_cwnd, stats_.cwnd_increase_cubic_mode);
   EXPECT_EQ(0u, stats_.cwnd_increase_reno_mode);
 }
 
 
 TEST_F(CubicTest, LossEvents) {
   const QuicTime::Delta rtt_min = hundred_ms_;
   uint32 current_cwnd = 422;
@@ skipping 34 matching lines @@
     current_cwnd = cubic_.CongestionWindowAfterAck(current_cwnd, rtt_min);
   }
   expected_cwnd = 422;
   EXPECT_EQ(expected_cwnd, current_cwnd);
   EXPECT_EQ(expected_cwnd - old_cwnd, stats_.cwnd_increase_cubic_mode);
   EXPECT_EQ(0u, stats_.cwnd_increase_reno_mode);
 }
 
 }  // namespace test
 }  // namespace net