Land Recent QUIC Changes until 03/02/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 2e3e16d5a58b0ba72e2d3392e7a6c2621fc53754..a5384b77f422776c26771b7b7d81265ba5344004 100644
--- a/net/quic/quic_time_wait_list_manager.cc
+++ b/net/quic/quic_time_wait_list_manager.cc
@@ -113,10 +113,8 @@ void QuicTimeWaitListManager::AddConnectionIdToTimeWait(
     connection_id_map_.erase(it);
   }
   TrimTimeWaitListIfNeeded();
-  if (FLAGS_quic_limit_time_wait_list_size) {
-    DCHECK_LT(num_connections(),
-              static_cast<size_t>(FLAGS_quic_time_wait_list_max_connections));
-  }
+  DCHECK_LT(num_connections(),
+            static_cast<size_t>(FLAGS_quic_time_wait_list_max_connections));
   ConnectionIdData data(num_packets,
                         version,
                         helper_->GetClock()->ApproximateNow(),
@@ -291,36 +289,20 @@ bool QuicTimeWaitListManager::MaybeExpireOldestConnection(
 void QuicTimeWaitListManager::CleanUpOldConnectionIds() {
   QuicTime now = helper_->GetClock()->ApproximateNow();
   QuicTime expiration = now.Subtract(kTimeWaitPeriod_);
-  if (FLAGS_quic_limit_time_wait_list_size) {
-    while (MaybeExpireOldestConnection(expiration)) {
-    }
-  } else {
-    while (!connection_id_map_.empty()) {
-      ConnectionIdMap::iterator it = connection_id_map_.begin();
-      QuicTime oldest_connection_id = it->second.time_added;
-      if (now.Subtract(oldest_connection_id) < kTimeWaitPeriod_) {
-        break;
-      }
-      const QuicConnectionId connection_id = it->first;
-      // This connection_id has lived its age, retire it now.
-      delete it->second.close_packet;
-      connection_id_map_.erase(it);
-      visitor_->OnConnectionRemovedFromTimeWaitList(connection_id);
-    }
+
+  while (MaybeExpireOldestConnection(expiration)) {
   }
 
   SetConnectionIdCleanUpAlarm();
 }
 
 void QuicTimeWaitListManager::TrimTimeWaitListIfNeeded() {
-  if (FLAGS_quic_limit_time_wait_list_size) {
-    if (FLAGS_quic_time_wait_list_max_connections < 0) {
-      return;
-    }
-    while (num_connections() >=
-           static_cast<size_t>(FLAGS_quic_time_wait_list_max_connections)) {
-      MaybeExpireOldestConnection(QuicTime::Infinite());
-    }
+  if (FLAGS_quic_time_wait_list_max_connections < 0) {
+    return;
+  }
+  while (num_connections() >=
+         static_cast<size_t>(FLAGS_quic_time_wait_list_max_connections)) {
+    MaybeExpireOldestConnection(QuicTime::Infinite());
   }
 }