Land Recent QUIC Changes until 03/22/2015.

net/quic/quic_time_wait_list_manager.cc

Index: net/quic/quic_time_wait_list_manager.cc
diff --git a/net/quic/quic_time_wait_list_manager.cc b/net/quic/quic_time_wait_list_manager.cc
index a5384b77f422776c26771b7b7d81265ba5344004..0311913d44b1cf19d44c0d7e51df514864cd5456 100644
--- a/net/quic/quic_time_wait_list_manager.cc
+++ b/net/quic/quic_time_wait_list_manager.cc
@@ -81,7 +81,7 @@ QuicTimeWaitListManager::QuicTimeWaitListManager(
     QuicConnectionHelperInterface* helper,
     const QuicVersionVector& supported_versions)
     : helper_(helper),
-      kTimeWaitPeriod_(
+      time_wait_period_(
           QuicTime::Delta::FromSeconds(FLAGS_quic_time_wait_list_seconds)),
       connection_id_clean_up_alarm_(
           helper_->CreateAlarm(new ConnectionIdCleanUpAlarm(this))),
@@ -254,14 +254,14 @@ void QuicTimeWaitListManager::SetConnectionIdCleanUpAlarm() {
   if (!connection_id_map_.empty()) {
     QuicTime oldest_connection_id =
         connection_id_map_.begin()->second.time_added;
-    if (now.Subtract(oldest_connection_id) < kTimeWaitPeriod_) {
-      next_alarm_time = oldest_connection_id.Add(kTimeWaitPeriod_);
+    if (now.Subtract(oldest_connection_id) < time_wait_period_) {
+      next_alarm_time = oldest_connection_id.Add(time_wait_period_);
     } else {
       LOG(ERROR) << "ConnectionId lingered for longer than kTimeWaitPeriod";
     }
   } else {
-    // No connection_ids added so none will expire before kTimeWaitPeriod_.
-    next_alarm_time = now.Add(kTimeWaitPeriod_);
+    // No connection_ids added so none will expire before time_wait_period_.
+    next_alarm_time = now.Add(time_wait_period_);
   }
 
   connection_id_clean_up_alarm_->Set(next_alarm_time);
@@ -288,7 +288,7 @@ bool QuicTimeWaitListManager::MaybeExpireOldestConnection(
 
 void QuicTimeWaitListManager::CleanUpOldConnectionIds() {
   QuicTime now = helper_->GetClock()->ApproximateNow();
-  QuicTime expiration = now.Subtract(kTimeWaitPeriod_);
+  QuicTime expiration = now.Subtract(time_wait_period_);
 
   while (MaybeExpireOldestConnection(expiration)) {
   }