Land Recent QUIC Changes.

net/tools/quic/quic_dispatcher.cc

Index: net/tools/quic/quic_dispatcher.cc
diff --git a/net/tools/quic/quic_dispatcher.cc b/net/tools/quic/quic_dispatcher.cc
index 46f672ea0f100e0a4952362367da51fa4b450e47..8f19cf4e54b13b9414109978b59f846d5b6322ef 100644
--- a/net/tools/quic/quic_dispatcher.cc
+++ b/net/tools/quic/quic_dispatcher.cc
@@ -24,7 +24,6 @@ namespace net {
 namespace tools {
 
 using base::StringPiece;
-using std::make_pair;
 
 class DeleteSessionsAlarm : public EpollAlarm {
  public:
@@ -254,7 +253,7 @@ bool QuicDispatcher::OnUnauthenticatedPublicHeader(
       return HandlePacketForTimeWait(header);
     }
     DVLOG(1) << "Created new session for " << connection_id;
-    session_map_.insert(make_pair(connection_id, session));
+    session_map_.insert(std::make_pair(connection_id, session));
   } else {
     session = it->second;
   }
@@ -352,7 +351,7 @@ void QuicDispatcher::OnWriteBlocked(
     // infinite loops in OnCanWrite.
     return;
   }
-  write_blocked_list_.insert(make_pair(blocked_writer, true));
+  write_blocked_list_.insert(std::make_pair(blocked_writer, true));
 }
 
 void QuicDispatcher::OnConnectionAddedToTimeWaitList(