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

Unified Diff: net/tools/balsa/balsa_headers.cc

Issue 1897033002: Reland 'Convert //net and //chromecast to std::unordered_*' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix TestDownloadRequestHandler Created 4 years, 8 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/spdy/write_blocked_list.h ('k') | net/tools/balsa/string_piece_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/balsa/balsa_headers.cc
diff --git a/net/tools/balsa/balsa_headers.cc b/net/tools/balsa/balsa_headers.cc
index 1bb684a1d24d53bebfe0fcbac91811de623a204c..0ad88c5261b0cb43d3e909cf6691a65d35ced62f 100644
--- a/net/tools/balsa/balsa_headers.cc
+++ b/net/tools/balsa/balsa_headers.cc
@@ -5,12 +5,13 @@
#include "net/tools/balsa/balsa_headers.h"
#include <stdio.h>
+
#include <algorithm>
#include <string>
+#include <unordered_set>
#include <utility>
#include <vector>
-#include "base/containers/hash_tables.h"
#include "base/logging.h"
#include "base/strings/string_piece.h"
#include "base/strings/stringprintf.h"
@@ -33,14 +34,10 @@ const char kContentLength[] = "Content-Length";
const char kTransferEncoding[] = "Transfer-Encoding";
const char kSpaceChar = ' ';
-#if defined(COMPILER_MSVC)
-base::hash_set<base::StringPiece,
- net::StringPieceCaseCompare> g_multivalued_headers;
-#else
-base::hash_set<base::StringPiece,
- net::StringPieceCaseHash,
- net::StringPieceCaseEqual> g_multivalued_headers;
-#endif
+std::unordered_set<base::StringPiece,
+ net::StringPieceCaseHash,
+ net::StringPieceCaseEqual>
+ g_multivalued_headers;
void InitMultivaluedHeaders() {
g_multivalued_headers.insert("accept");
« no previous file with comments | « net/spdy/write_blocked_list.h ('k') | net/tools/balsa/string_piece_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698