[/net] Use std::unique_ptr or base::WrapUnique more
This should cause no functional changes.
Bug: 479898
Change-Id: I861e5eab8dd6cb617c88dbd516cd181ccb80bd21
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3747601
Commit-Queue: Tsuyoshi Horo <[email protected]>
Reviewed-by: Adam Rice <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1022541}
diff --git a/net/socket/connect_job_unittest.cc b/net/socket/connect_job_unittest.cc
index 8e8918b..a413457f 100644
--- a/net/socket/connect_job_unittest.cc
+++ b/net/socket/connect_job_unittest.cc
@@ -68,8 +68,8 @@
return ResolveErrorInfo(net::OK);
}
int ConnectInternal() override {
- SetSocket(std::unique_ptr<StreamSocket>(new MockTCPClientSocket(
- AddressList(), net_log().net_log(), &socket_data_provider_)),
+ SetSocket(std::make_unique<MockTCPClientSocket>(
+ AddressList(), net_log().net_log(), &socket_data_provider_),
absl::nullopt /* dns_aliases */);
return socket()->Connect(base::BindOnce(
&TestConnectJob::NotifyDelegateOfCompletion, base::Unretained(this)));
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
index 926e6005..90071bc1 100644
--- a/net/socket/socket_test_util.cc
+++ b/net/socket/socket_test_util.cc
@@ -1978,11 +1978,12 @@
std::unique_ptr<StreamSocket> socket =
client_socket_factory_->CreateTransportClientSocket(
AddressList(), nullptr, nullptr, net_log.net_log(), NetLogSource());
- MockConnectJob* job = new MockConnectJob(
+ auto job = std::make_unique<MockConnectJob>(
std::move(socket), handle, socket_tag, std::move(callback), priority);
- job_list_.push_back(base::WrapUnique(job));
+ auto* job_ptr = job.get();
+ job_list_.push_back(std::move(job));
handle->set_group_generation(1);
- return job->Connect();
+ return job_ptr->Connect();
}
void MockTransportClientSocketPool::SetPriority(
diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc
index 11e22f68..e0db5b90 100644
--- a/net/socket/socks5_client_socket_unittest.cc
+++ b/net/socket/socks5_client_socket_unittest.cc
@@ -92,7 +92,9 @@
NetLog* net_log) {
TestCompletionCallback callback;
data_ = std::make_unique<StaticSocketDataProvider>(reads, writes);
- tcp_sock_ = new MockTCPClientSocket(address_list_, net_log, data_.get());
+ auto tcp_sock = std::make_unique<MockTCPClientSocket>(address_list_, net_log,
+ data_.get());
+ tcp_sock_ = tcp_sock.get();
int rv = tcp_sock_->Connect(callback.callback());
EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
@@ -102,7 +104,7 @@
// The SOCKS5ClientSocket takes ownership of |tcp_sock_|, but keep a
// non-owning pointer to it.
- return std::make_unique<SOCKS5ClientSocket>(base::WrapUnique(tcp_sock_.get()),
+ return std::make_unique<SOCKS5ClientSocket>(std::move(tcp_sock),
HostPortPair(hostname, port),
TRAFFIC_ANNOTATION_FOR_TESTS);
}
@@ -364,7 +366,7 @@
auto tagging_sock = std::make_unique<MockTaggingStreamSocket>(
std::make_unique<MockTCPClientSocket>(address_list_, NetLog::Get(),
&data));
- MockTaggingStreamSocket* raw_tagging_sock = tagging_sock.get();
+ auto* tagging_sock_ptr = tagging_sock.get();
// |socket| takes ownership of |tagging_sock|, but keep a non-owning pointer
// to it.
@@ -372,11 +374,11 @@
HostPortPair("localhost", 80),
TRAFFIC_ANNOTATION_FOR_TESTS);
- EXPECT_EQ(raw_tagging_sock->tag(), SocketTag());
+ EXPECT_EQ(tagging_sock_ptr->tag(), SocketTag());
#if BUILDFLAG(IS_ANDROID)
SocketTag tag(0x12345678, 0x87654321);
socket.ApplySocketTag(tag);
- EXPECT_EQ(raw_tagging_sock->tag(), tag);
+ EXPECT_EQ(tagging_sock_ptr->tag(), tag);
#endif // BUILDFLAG(IS_ANDROID)
}
diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc
index 0edba2c..4ecade0 100644
--- a/net/socket/socks_client_socket_unittest.cc
+++ b/net/socket/socks_client_socket_unittest.cc
@@ -429,7 +429,7 @@
auto tagging_sock = std::make_unique<MockTaggingStreamSocket>(
std::make_unique<MockTCPClientSocket>(address_list_, NetLog::Get(),
&data));
- MockTaggingStreamSocket* raw_tagging_sock = tagging_sock.get();
+ auto* tagging_sock_ptr = tagging_sock.get();
auto connection = std::make_unique<ClientSocketHandle>();
// |connection| takes ownership of |tagging_sock|, but keep a
@@ -440,11 +440,11 @@
NetworkIsolationKey(), DEFAULT_PRIORITY, &host_resolver,
SecureDnsPolicy::kAllow, TRAFFIC_ANNOTATION_FOR_TESTS);
- EXPECT_EQ(raw_tagging_sock->tag(), SocketTag());
+ EXPECT_EQ(tagging_sock_ptr->tag(), SocketTag());
#if BUILDFLAG(IS_ANDROID)
SocketTag tag(0x12345678, 0x87654321);
socket.ApplySocketTag(tag);
- EXPECT_EQ(raw_tagging_sock->tag(), tag);
+ EXPECT_EQ(tagging_sock_ptr->tag(), tag);
#endif // BUILDFLAG(IS_ANDROID)
}
diff --git a/net/socket/socks_connect_job.cc b/net/socket/socks_connect_job.cc
index 5436afa0d..5bcecc50 100644
--- a/net/socket/socks_connect_job.cc
+++ b/net/socket/socks_connect_job.cc
@@ -182,12 +182,13 @@
transport_connect_job_->PassSocket(), socks_params_->destination(),
socks_params_->traffic_annotation());
} else {
- socks_socket_ptr_ = new SOCKSClientSocket(
+ auto socks_socket = std::make_unique<SOCKSClientSocket>(
transport_connect_job_->PassSocket(), socks_params_->destination(),
socks_params_->network_isolation_key(), priority(), host_resolver(),
socks_params_->transport_params()->secure_dns_policy(),
socks_params_->traffic_annotation());
- socket_.reset(socks_socket_ptr_);
+ socks_socket_ptr_ = socks_socket.get();
+ socket_ = std::move(socks_socket);
}
transport_connect_job_.reset();
return socket_->Connect(
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 5149a27..3b022704 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -5092,18 +5092,18 @@
auto tagging_sock =
std::make_unique<MockTaggingStreamSocket>(std::move(transport));
- MockTaggingStreamSocket* raw_tagging_sock = tagging_sock.get();
+ auto* tagging_sock_ptr = tagging_sock.get();
// |sock| takes ownership of |tagging_sock|, but keep a
// non-owning pointer to it.
std::unique_ptr<SSLClientSocket> sock(CreateSSLClientSocket(
std::move(tagging_sock), host_port_pair(), SSLConfig()));
- EXPECT_EQ(raw_tagging_sock->tag(), SocketTag());
+ EXPECT_EQ(tagging_sock_ptr->tag(), SocketTag());
#if BUILDFLAG(IS_ANDROID)
SocketTag tag(0x12345678, 0x87654321);
sock->ApplySocketTag(tag);
- EXPECT_EQ(raw_tagging_sock->tag(), tag);
+ EXPECT_EQ(tagging_sock_ptr->tag(), tag);
#endif // BUILDFLAG(IS_ANDROID)
}
diff --git a/net/socket/udp_socket_win.cc b/net/socket/udp_socket_win.cc
index 554d7fe9..cb92582 100644
--- a/net/socket/udp_socket_win.cc
+++ b/net/socket/udp_socket_win.cc
@@ -330,7 +330,7 @@
SockaddrStorage storage;
if (getpeername(socket_, storage.addr, &storage.addr_len))
return MapSystemError(WSAGetLastError());
- std::unique_ptr<IPEndPoint> remote_address(new IPEndPoint());
+ auto remote_address = std::make_unique<IPEndPoint>();
if (!remote_address->FromSockAddr(storage.addr, storage.addr_len))
return ERR_ADDRESS_INVALID;
remote_address_ = std::move(remote_address);
@@ -351,7 +351,7 @@
SockaddrStorage storage;
if (getsockname(socket_, storage.addr, &storage.addr_len))
return MapSystemError(WSAGetLastError());
- std::unique_ptr<IPEndPoint> local_address(new IPEndPoint());
+ auto local_address = std::make_unique<IPEndPoint>();
if (!local_address->FromSockAddr(storage.addr, storage.addr_len))
return ERR_ADDRESS_INVALID;
local_address_ = std::move(local_address);
