| Index: net/tools/quic/quic_server.h
|
| diff --git a/net/tools/quic/quic_server.h b/net/tools/quic/quic_server.h
|
| index 24523ded14fc777c0c9d0e93236ee1c7cdba77da..db177e4b7d18bf665110bb1f97e01fb7c7f73945 100644
|
| --- a/net/tools/quic/quic_server.h
|
| +++ b/net/tools/quic/quic_server.h
|
| @@ -14,7 +14,6 @@
|
| #include <stddef.h>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/base/ip_endpoint.h"
|
| #include "net/quic/crypto/quic_crypto_server_config.h"
|
| #include "net/quic/quic_chromium_connection_helper.h"
|
| @@ -94,7 +93,7 @@ class QuicServer : public EpollCallbackInterface {
|
| void Initialize();
|
|
|
| // Accepts data from the framer and demuxes clients to sessions.
|
| - scoped_ptr<QuicDispatcher> dispatcher_;
|
| + std::unique_ptr<QuicDispatcher> dispatcher_;
|
| // Frames incoming packets and hands them to the dispatcher.
|
| EpollServer epoll_server_;
|
|
|
| @@ -129,7 +128,7 @@ class QuicServer : public EpollCallbackInterface {
|
|
|
| // Point to a QuicPacketReader object on the heap. The reader allocates more
|
| // space than allowed on the stack.
|
| - scoped_ptr<QuicPacketReader> packet_reader_;
|
| + std::unique_ptr<QuicPacketReader> packet_reader_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(QuicServer);
|
| };
|
|
|