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

Unified Diff: net/socket/unix_domain_server_socket_posix.cc

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
Index: net/socket/unix_domain_server_socket_posix.cc
diff --git a/net/socket/unix_domain_server_socket_posix.cc b/net/socket/unix_domain_server_socket_posix.cc
index b6ba35c63625cdc6577b24e75aa43f5241fb9de6..ecd9adf3d3603e53e7fc5eb73cd4a29f7fbbf794 100644
--- a/net/socket/unix_domain_server_socket_posix.cc
+++ b/net/socket/unix_domain_server_socket_posix.cc
@@ -21,13 +21,13 @@ namespace net {
namespace {
// Intended for use as SetterCallbacks in Accept() helper methods.
-void SetStreamSocket(scoped_ptr<StreamSocket>* socket,
- scoped_ptr<SocketPosix> accepted_socket) {
+void SetStreamSocket(std::unique_ptr<StreamSocket>* socket,
+ std::unique_ptr<SocketPosix> accepted_socket) {
socket->reset(new UnixDomainClientSocket(std::move(accepted_socket)));
}
void SetSocketDescriptor(SocketDescriptor* socket,
- scoped_ptr<SocketPosix> accepted_socket) {
+ std::unique_ptr<SocketPosix> accepted_socket) {
*socket = accepted_socket->ReleaseConnectedSocket();
}
@@ -86,7 +86,7 @@ int UnixDomainServerSocket::BindAndListen(const std::string& socket_path,
return ERR_ADDRESS_INVALID;
}
- scoped_ptr<SocketPosix> socket(new SocketPosix);
+ std::unique_ptr<SocketPosix> socket(new SocketPosix);
int rv = socket->Open(AF_UNIX);
DCHECK_NE(ERR_IO_PENDING, rv);
if (rv != OK)
@@ -118,7 +118,7 @@ int UnixDomainServerSocket::GetLocalAddress(IPEndPoint* address) const {
return ERR_ADDRESS_INVALID;
}
-int UnixDomainServerSocket::Accept(scoped_ptr<StreamSocket>* socket,
+int UnixDomainServerSocket::Accept(std::unique_ptr<StreamSocket>* socket,
const CompletionCallback& callback) {
DCHECK(socket);
« no previous file with comments | « net/socket/unix_domain_server_socket_posix.h ('k') | net/socket/unix_domain_server_socket_posix_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698