Modernize smart pointers in QUIC tests
Change-Id: I9849fa0960d60c0caecb7afbe03fb05aa1e8cbd2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2673968
Commit-Queue: Renjie Tang <[email protected]>
Commit-Queue: David Schinazi <[email protected]>
Auto-Submit: Renjie Tang <[email protected]>
Reviewed-by: David Schinazi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#850302}
diff --git a/net/quic/quic_proxy_client_socket_unittest.cc b/net/quic/quic_proxy_client_socket_unittest.cc
index 0102c631..08874b2 100644
--- a/net/quic/quic_proxy_client_socket_unittest.cc
+++ b/net/quic/quic_proxy_client_socket_unittest.cc
@@ -223,7 +223,8 @@
.Times(AnyNumber());
helper_.reset(
new QuicChromiumConnectionHelper(&clock_, &random_generator_));
- alarm_factory_.reset(new QuicChromiumAlarmFactory(runner_.get(), &clock_));
+ alarm_factory_ =
+ std::make_unique<QuicChromiumAlarmFactory>(runner_.get(), &clock_);
QuicChromiumPacketWriter* writer = new QuicChromiumPacketWriter(
socket.get(), base::ThreadTaskRunnerHandle::Get().get());
@@ -248,7 +249,7 @@
base::TimeTicks dns_end = base::TimeTicks::Now();
base::TimeTicks dns_start = dns_end - base::TimeDelta::FromMilliseconds(1);
- session_.reset(new QuicChromiumClientSession(
+ session_ = std::make_unique<QuicChromiumClientSession>(
connection, std::move(socket),
/*stream_factory=*/nullptr, &crypto_client_stream_factory_, &clock_,
&transport_security_state_, /*ssl_config_service=*/nullptr,
@@ -278,7 +279,7 @@
std::make_unique<quic::QuicClientPushPromiseIndex>(), nullptr,
base::DefaultTickClock::GetInstance(),
base::ThreadTaskRunnerHandle::Get().get(),
- /*socket_performance_watcher=*/nullptr, net_log_.bound().net_log()));
+ /*socket_performance_watcher=*/nullptr, net_log_.bound().net_log());
writer->set_delegate(session_.get());
@@ -304,7 +305,7 @@
session_handle_->ReleaseStream();
EXPECT_TRUE(stream_handle->IsOpen());
- sock_.reset(new QuicProxyClientSocket(
+ sock_ = std::make_unique<QuicProxyClientSocket>(
std::move(stream_handle), std::move(session_handle_),
ProxyServer(ProxyServer::SCHEME_HTTPS, proxy_host_port_), user_agent_,
endpoint_host_port_, net_log_.bound(),
@@ -313,7 +314,7 @@
NetworkIsolationKey(), &http_auth_cache_,
http_auth_handler_factory_.get(),
host_resolver_.get()),
- proxy_delegate_.get()));
+ proxy_delegate_.get());
session_->StartReading();
}
