| 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();
|
| }
|
|
|
|
|