Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(816)

Unified Diff: net/quic/core/quic_connection.cc

Issue 2651673004: Add quic_map_util. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/core/quic_buffered_packet_store_test.cc ('k') | net/quic/core/quic_connection_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/quic_connection.cc
diff --git a/net/quic/core/quic_connection.cc b/net/quic/core/quic_connection.cc
index 94e68b96292a63d6c4fa39d3d688e1d10a3efac0..4308c624f8ee64720965f23d197eb7141ae751a6 100644
--- a/net/quic/core/quic_connection.cc
+++ b/net/quic/core/quic_connection.cc
@@ -17,7 +17,6 @@
#include "base/format_macros.h"
#include "base/macros.h"
#include "base/metrics/histogram_macros.h"
-#include "base/stl_util.h"
#include "net/base/address_family.h"
#include "net/base/ip_address.h"
#include "net/base/net_errors.h"
@@ -33,6 +32,7 @@
#include "net/quic/core/quic_utils.h"
#include "net/quic/platform/api/quic_bug_tracker.h"
#include "net/quic/platform/api/quic_logging.h"
+#include "net/quic/platform/api/quic_map_util.h"
#include "net/quic/platform/api/quic_str_cat.h"
#include "net/quic/platform/api/quic_text_utils.h"
@@ -393,7 +393,7 @@ bool QuicConnection::SelectMutualVersion(
const QuicVersionVector& supported_versions = framer_.supported_versions();
for (size_t i = 0; i < supported_versions.size(); ++i) {
const QuicVersion& version = supported_versions[i];
- if (base::ContainsValue(available_versions, version)) {
+ if (QuicContainsValue(available_versions, version)) {
framer_.set_version(version);
return true;
}
@@ -511,7 +511,7 @@ void QuicConnection::OnVersionNegotiationPacket(
return;
}
- if (base::ContainsValue(packet.versions, version())) {
+ if (QuicContainsValue(packet.versions, version())) {
const string error_details =
"Server already supports client's version and should have accepted the "
"connection.";
« no previous file with comments | « net/quic/core/quic_buffered_packet_store_test.cc ('k') | net/quic/core/quic_connection_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698