Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Unified Diff: net/socket/unix_domain_client_socket_posix.h

Issue 1892323002: Change scoped_ptr to std::unique_ptr in //net/socket. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/transport_client_socket_unittest.cc ('k') | net/socket/unix_domain_client_socket_posix.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/unix_domain_client_socket_posix.h
diff --git a/net/socket/unix_domain_client_socket_posix.h b/net/socket/unix_domain_client_socket_posix.h
index 596aa096c538be81745d9fa036d912a49006dbe8..e7b033a71c3d8745f8f1e8f5c59e612389587bdd 100644
--- a/net/socket/unix_domain_client_socket_posix.h
+++ b/net/socket/unix_domain_client_socket_posix.h
@@ -7,10 +7,10 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "net/base/completion_callback.h"
#include "net/base/net_export.h"
#include "net/log/net_log.h"
@@ -31,7 +31,7 @@ class NET_EXPORT UnixDomainClientSocket : public StreamSocket {
bool use_abstract_namespace);
// Builds a client socket with SocketPosix which is already connected.
// UnixDomainServerSocket uses this after it accepts a connection.
- explicit UnixDomainClientSocket(scoped_ptr<SocketPosix> socket);
+ explicit UnixDomainClientSocket(std::unique_ptr<SocketPosix> socket);
~UnixDomainClientSocket() override;
@@ -78,7 +78,7 @@ class NET_EXPORT UnixDomainClientSocket : public StreamSocket {
private:
const std::string socket_path_;
const bool use_abstract_namespace_;
- scoped_ptr<SocketPosix> socket_;
+ std::unique_ptr<SocketPosix> socket_;
// This net log is just to comply StreamSocket::NetLog(). It throws away
// everything.
BoundNetLog net_log_;
« no previous file with comments | « net/socket/transport_client_socket_unittest.cc ('k') | net/socket/unix_domain_client_socket_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698