| Index: net/tools/quic/quic_simple_server.h
|
| diff --git a/net/tools/quic/quic_simple_server.h b/net/tools/quic/quic_simple_server.h
|
| index 21c39bf752166a74417a03e0edfd3859a20bf280..e9dcdca22a110e8ec6b2d554677564e14bcea954 100644
|
| --- a/net/tools/quic/quic_simple_server.h
|
| +++ b/net/tools/quic/quic_simple_server.h
|
| @@ -8,8 +8,9 @@
|
| #ifndef NET_QUIC_TOOLS_QUIC_SIMPLE_SERVER_H_
|
| #define NET_QUIC_TOOLS_QUIC_SIMPLE_SERVER_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/base/io_buffer.h"
|
| #include "net/base/ip_endpoint.h"
|
| #include "net/log/net_log.h"
|
| @@ -64,7 +65,7 @@ class QuicSimpleServer {
|
| void Initialize();
|
|
|
| // Accepts data from the framer and demuxes clients to sessions.
|
| - scoped_ptr<QuicDispatcher> dispatcher_;
|
| + std::unique_ptr<QuicDispatcher> dispatcher_;
|
|
|
| // Used by the helper_ to time alarms.
|
| QuicClock clock_;
|
| @@ -73,7 +74,7 @@ class QuicSimpleServer {
|
| QuicChromiumConnectionHelper* helper_;
|
|
|
| // Listening socket. Also used for outbound client communication.
|
| - scoped_ptr<UDPServerSocket> socket_;
|
| + std::unique_ptr<UDPServerSocket> socket_;
|
|
|
| // config_ contains non-crypto parameters that are negotiated in the crypto
|
| // handshake.
|
|
|