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

Unified Diff: net/tools/quic/test_tools/mock_epoll_server.h

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/tools/quic/quic_simple_server_session.h ('k') | net/url_request/url_request_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/quic/test_tools/mock_epoll_server.h
diff --git a/net/tools/quic/test_tools/mock_epoll_server.h b/net/tools/quic/test_tools/mock_epoll_server.h
index f56f4ab19538c31894ee9f2724a9e0f7ab515a66..9eac59403bcd3df1c08844886cbc0a705fb4c260 100644
--- a/net/tools/quic/test_tools/mock_epoll_server.h
+++ b/net/tools/quic/test_tools/mock_epoll_server.h
@@ -8,6 +8,9 @@
#include <stddef.h>
#include <stdint.h>
+#include <unordered_map>
+#include <unordered_set>
+
#include "base/logging.h"
#include "base/macros.h"
#include "net/tools/epoll_server/epoll_server.h"
@@ -52,7 +55,7 @@ class FakeTimeEpollServer : public EpollServer {
class MockEpollServer : public FakeTimeEpollServer {
public: // type definitions
- typedef base::hash_multimap<int64_t, struct epoll_event> EventQueue;
+ using EventQueue = std::unordered_multimap<int64_t, struct epoll_event>;
MockEpollServer();
~MockEpollServer() override;
@@ -81,7 +84,7 @@ class MockEpollServer : public FakeTimeEpollServer {
WaitForEventsAndExecuteCallbacks();
}
- base::hash_set<AlarmCB*>::size_type NumberOfAlarms() const {
+ std::unordered_set<AlarmCB*>::size_type NumberOfAlarms() const {
return all_alarms_.size();
}
« no previous file with comments | « net/tools/quic/quic_simple_server_session.h ('k') | net/url_request/url_request_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698