Land Recent QUIC Changes.

net/tools/quic/quic_time_wait_list_manager.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/tools/quic/quic_time_wait_list_manager.h"
 
 #include <errno.h>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "net/base/ip_endpoint.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_clock.h"
 #include "net/quic/quic_flags.h"
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_utils.h"
 #include "net/tools/epoll_server/epoll_server.h"
 #include "net/tools/quic/quic_server_session.h"
 
 using base::StringPiece;
-using std::make_pair;
 
 namespace net {
 namespace tools {
 
 // TODO(rtenneti): Remove the duplicated code in this file. Share code with
 // "net/quic/quic_time_wait_list_manager.cc"
 
 // A very simple alarm that just informs the QuicTimeWaitListManager to clean
 // up old connection_ids. This alarm should be unregistered and deleted before
 // the QuicTimeWaitListManager is deleted.
@@ skipping 84 matching lines @@
   }
   TrimTimeWaitListIfNeeded();
   if (FLAGS_quic_limit_time_wait_list_size) {
     DCHECK_LT(num_connections(),
               static_cast<size_t>(FLAGS_quic_time_wait_list_max_connections));
   }
   ConnectionIdData data(num_packets,
                         version,
                         clock_.ApproximateNow(),
                         close_packet);
-  connection_id_map_.insert(make_pair(connection_id, data));
+  connection_id_map_.insert(std::make_pair(connection_id, data));
   if (new_connection_id) {
     visitor_->OnConnectionAddedToTimeWaitList(connection_id);
   }
 }
 
 bool QuicTimeWaitListManager::IsConnectionIdInTimeWait(
     QuicConnectionId connection_id) const {
   return ContainsKey(connection_id_map_, connection_id);
 }
 
@@ skipping 188 matching lines @@
     }
     while (num_connections() >=
            static_cast<size_t>(FLAGS_quic_time_wait_list_max_connections)) {
       MaybeExpireOldestConnection(QuicTime::Infinite());
     }
   }
 }
 
 }  // namespace tools
 }  // namespace net