Change QuicTestClient::set_client() signature to reflect that it takes ownership. Also make changes to quic_test_client.cc in the spirit of go/totw/126. PiperOrigin-RevId: 569502472
diff --git a/quiche/quic/test_tools/quic_test_client.cc b/quiche/quic/test_tools/quic_test_client.cc index a70fa94..2a464a4 100644 --- a/quiche/quic/test_tools/quic_test_client.cc +++ b/quiche/quic/test_tools/quic_test_client.cc
@@ -298,7 +298,7 @@ QuicSocketAddress server_address, const std::string& server_hostname, const QuicConfig& config, const ParsedQuicVersionVector& supported_versions) : event_loop_(GetDefaultEventLoop()->Create(QuicDefaultClock::Get())), - client_(new MockableQuicClient( + client_(std::make_unique<MockableQuicClient>( server_address, QuicServerId(server_hostname, server_address.port(), false), config, supported_versions, event_loop_.get())) { @@ -310,7 +310,7 @@ const QuicConfig& config, const ParsedQuicVersionVector& supported_versions, std::unique_ptr<ProofVerifier> proof_verifier) : event_loop_(GetDefaultEventLoop()->Create(QuicDefaultClock::Get())), - client_(new MockableQuicClient( + client_(std::make_unique<MockableQuicClient>( server_address, QuicServerId(server_hostname, server_address.port(), false), config, supported_versions, event_loop_.get(), std::move(proof_verifier))) { @@ -323,7 +323,7 @@ std::unique_ptr<ProofVerifier> proof_verifier, std::unique_ptr<SessionCache> session_cache) : event_loop_(GetDefaultEventLoop()->Create(QuicDefaultClock::Get())), - client_(new MockableQuicClient( + client_(std::make_unique<MockableQuicClient>( server_address, QuicServerId(server_hostname, server_address.port(), false), config, supported_versions, event_loop_.get(), std::move(proof_verifier), @@ -338,7 +338,7 @@ std::unique_ptr<SessionCache> session_cache, std::unique_ptr<QuicEventLoop> event_loop) : event_loop_(std::move(event_loop)), - client_(new MockableQuicClient( + client_(std::make_unique<MockableQuicClient>( server_address, QuicServerId(server_hostname, server_address.port(), false), config, supported_versions, event_loop_.get(), std::move(proof_verifier), @@ -417,8 +417,8 @@ if (rv == QUIC_SUCCESS) return 1; if (rv == QUIC_PENDING) { // May need to retry request if asynchronous rendezvous fails. - std::unique_ptr<spdy::Http2HeaderBlock> new_headers( - new spdy::Http2HeaderBlock(headers->Clone())); + auto new_headers = + std::make_unique<spdy::Http2HeaderBlock>(headers->Clone()); push_promise_data_to_resend_ = std::make_unique<TestClientDataToResend>( std::move(new_headers), body, fin, this, std::move(ack_listener)); return 1;
diff --git a/quiche/quic/test_tools/quic_test_client.h b/quiche/quic/test_tools/quic_test_client.h index 8d5ba85..64d49f3 100644 --- a/quiche/quic/test_tools/quic_test_client.h +++ b/quiche/quic/test_tools/quic_test_client.h
@@ -311,7 +311,9 @@ void Initialize(); - void set_client(MockableQuicClient* client) { client_.reset(client); } + void set_client(std::unique_ptr<MockableQuicClient> client) { + client_ = std::move(client); + } // Given |uri|, populates the fields in |headers| for a simple GET // request. If |uri| is a relative URL, the QuicServerId will be