Index: net/udp/udp_socket_posix.h |
diff --git a/net/udp/udp_socket_posix.h b/net/udp/udp_socket_posix.h |
index 60b095c0d4ae9c1ee4c2f7c6e42e61ed2e7fcfab..7da58c1a62938d5e3ece38eb2fe24cce9cc534b0 100644 |
--- a/net/udp/udp_socket_posix.h |
+++ b/net/udp/udp_socket_posix.h |
@@ -7,9 +7,10 @@ |
#include <stdint.h> |
+#include <memory> |
+ |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/message_loop/message_loop.h" |
#include "base/threading/non_thread_safe.h" |
#include "net/base/address_family.h" |
@@ -280,8 +281,8 @@ class NET_EXPORT UDPSocketPosix : public base::NonThreadSafe { |
// These are mutable since they're just cached copies to make |
// GetPeerAddress/GetLocalAddress smarter. |
- mutable scoped_ptr<IPEndPoint> local_address_; |
- mutable scoped_ptr<IPEndPoint> remote_address_; |
+ mutable std::unique_ptr<IPEndPoint> local_address_; |
+ mutable std::unique_ptr<IPEndPoint> remote_address_; |
// The socket's posix wrappers |
base::MessageLoopForIO::FileDescriptorWatcher read_socket_watcher_; |
@@ -299,7 +300,7 @@ class NET_EXPORT UDPSocketPosix : public base::NonThreadSafe { |
// The buffer used by InternalWrite() to retry Write requests |
scoped_refptr<IOBuffer> write_buf_; |
int write_buf_len_; |
- scoped_ptr<IPEndPoint> send_to_address_; |
+ std::unique_ptr<IPEndPoint> send_to_address_; |
// External callback; called when read is complete. |
CompletionCallback read_callback_; |