| Index: net/tools/quic/quic_dispatcher.h
|
| diff --git a/net/tools/quic/quic_dispatcher.h b/net/tools/quic/quic_dispatcher.h
|
| index 763280a8a478466c4b92e661fd40fd6b2df3b106..f4eda9f53a2b0635ca23554850e9fd4e5592351e 100644
|
| --- a/net/tools/quic/quic_dispatcher.h
|
| +++ b/net/tools/quic/quic_dispatcher.h
|
| @@ -13,7 +13,6 @@
|
|
|
| #include "base/containers/hash_tables.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/base/ip_endpoint.h"
|
| #include "net/base/linked_hash_map.h"
|
| #include "net/quic/crypto/quic_compressed_certs_cache.h"
|
| @@ -235,19 +234,19 @@ class QuicDispatcher : public QuicServerSessionVisitor,
|
| SessionMap session_map_;
|
|
|
| // Entity that manages connection_ids in time wait state.
|
| - scoped_ptr<QuicTimeWaitListManager> time_wait_list_manager_;
|
| + std::unique_ptr<QuicTimeWaitListManager> time_wait_list_manager_;
|
|
|
| // The list of closed but not-yet-deleted sessions.
|
| std::vector<QuicServerSessionBase*> closed_session_list_;
|
|
|
| // The helper used for all connections.
|
| - scoped_ptr<QuicConnectionHelperInterface> helper_;
|
| + std::unique_ptr<QuicConnectionHelperInterface> helper_;
|
|
|
| // An alarm which deletes closed sessions.
|
| - scoped_ptr<QuicAlarm> delete_sessions_alarm_;
|
| + std::unique_ptr<QuicAlarm> delete_sessions_alarm_;
|
|
|
| // The writer to write to the socket with.
|
| - scoped_ptr<QuicPacketWriter> writer_;
|
| + std::unique_ptr<QuicPacketWriter> writer_;
|
|
|
| // This vector contains QUIC versions which we currently support.
|
| // This should be ordered such that the highest supported version is the first
|
|
|