Index: net/quic/crypto/quic_crypto_client_config.cc |
diff --git a/net/quic/crypto/quic_crypto_client_config.cc b/net/quic/crypto/quic_crypto_client_config.cc |
index 18e9e60a1fa4e0b866252dc37fede620f8b59bba..9ec19fd8f1b5d737cc2b5d958c14a717f4f32e1f 100644 |
--- a/net/quic/crypto/quic_crypto_client_config.cc |
+++ b/net/quic/crypto/quic_crypto_client_config.cc |
@@ -23,8 +23,6 @@ |
#include "net/quic/quic_utils.h" |
using base::StringPiece; |
-using std::find; |
-using std::make_pair; |
using std::map; |
using std::string; |
using std::vector; |
@@ -324,7 +322,7 @@ QuicCryptoClientConfig::CachedState* QuicCryptoClientConfig::LookupOrCreate( |
} |
CachedState* cached = new CachedState; |
- cached_states_.insert(make_pair(server_id, cached)); |
+ cached_states_.insert(std::make_pair(server_id, cached)); |
bool cache_populated = PopulateFromCanonicalConfig(server_id, cached); |
UMA_HISTOGRAM_BOOLEAN( |
"Net.QuicCryptoClientConfig.PopulatedFromCanonicalConfig", |
@@ -840,7 +838,7 @@ void QuicCryptoClientConfig::PreferAesGcm() { |
if (aead.size() <= 1) { |
return; |
} |
- QuicTagVector::iterator pos = find(aead.begin(), aead.end(), kAESG); |
+ QuicTagVector::iterator pos = std::find(aead.begin(), aead.end(), kAESG); |
if (pos != aead.end()) { |
aead.erase(pos); |
aead.insert(aead.begin(), kAESG); |