Update from https://crrev.com/316786

net/quic/crypto/quic_crypto_server_config_test.cc

Index: net/quic/crypto/quic_crypto_server_config_test.cc
diff --git a/net/quic/crypto/quic_crypto_server_config_test.cc b/net/quic/crypto/quic_crypto_server_config_test.cc
index ac7f3e031a915d9781701db6bf77abdc54e71952..5134f505d402576b9095dea097e83f0bf2bde4b6 100644
--- a/net/quic/crypto/quic_crypto_server_config_test.cc
+++ b/net/quic/crypto/quic_crypto_server_config_test.cc
@@ -21,7 +21,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::StringPiece;
-using std::make_pair;
 using std::map;
 using std::pair;
 using std::string;
@@ -152,7 +151,7 @@ class QuicCryptoServerConfigPeer {
       // varargs will promote the value to an int so we have to read that from
       // the stack and cast down.
       const bool is_primary = static_cast<bool>(va_arg(ap, int));
-      expected.push_back(make_pair(server_config_id, is_primary));
+      expected.push_back(std::make_pair(server_config_id, is_primary));
     }
 
     va_end(ap);