diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 17:15:33 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:47:18 +0000 |
| commit | 7324afb043a0b1e623d8e8eb906cdc53bdeb4685 (patch) | |
| tree | a3fe2d74ea9c9e142c390dac4ca0e219382ace46 /chromium/net/tools/quic/quic_client.h | |
| parent | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (diff) | |
| download | qtwebengine-chromium-7324afb043a0b1e623d8e8eb906cdc53bdeb4685.tar.gz | |
BASELINE: Update Chromium to 58.0.3029.54
Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/net/tools/quic/quic_client.h')
| -rw-r--r-- | chromium/net/tools/quic/quic_client.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chromium/net/tools/quic/quic_client.h b/chromium/net/tools/quic/quic_client.h index 7a479f637d1..4c0e67363f6 100644 --- a/chromium/net/tools/quic/quic_client.h +++ b/chromium/net/tools/quic/quic_client.h @@ -14,10 +14,10 @@ #include "base/command_line.h" #include "base/macros.h" -#include "base/strings/string_piece.h" #include "net/quic/core/quic_client_push_promise_index.h" #include "net/quic/core/quic_config.h" #include "net/quic/core/quic_spdy_stream.h" +#include "net/quic/platform/api/quic_containers.h" #include "net/tools/epoll_server/epoll_server.h" #include "net/tools/quic/quic_client_base.h" #include "net/tools/quic/quic_client_session.h" @@ -90,12 +90,12 @@ class QuicClient : public QuicClientBase, EpollServer* epoll_server() { return epoll_server_; } - const linked_hash_map<int, QuicSocketAddress>& fd_address_map() const { + const QuicLinkedHashMap<int, QuicSocketAddress>& fd_address_map() const { return fd_address_map_; } private: - friend class net::test::QuicClientPeer; + friend class test::QuicClientPeer; // Actually clean up |fd|. void CleanUpUDPSocketImpl(int fd); @@ -105,7 +105,7 @@ class QuicClient : public QuicClientBase, // Map mapping created UDP sockets to their addresses. By using linked hash // map, the order of socket creation can be recorded. - linked_hash_map<int, QuicSocketAddress> fd_address_map_; + QuicLinkedHashMap<int, QuicSocketAddress> fd_address_map_; // If overflow_supported_ is true, this will be the number of packets dropped // during the lifetime of the server. |