Switch QuicMakeUnique to std::make_unique, part 1: //third_party/quic
gfe-relnote: n/a (no functional change)
PiperOrigin-RevId: 267662077
Change-Id: Ic63023042eafb77aa80d88749845f841b3078c57
diff --git a/quic/tools/quic_client.cc b/quic/tools/quic_client.cc
index 123cf1e..01964f6 100644
--- a/quic/tools/quic_client.cc
+++ b/quic/tools/quic_client.cc
@@ -109,7 +109,7 @@
std::unique_ptr<QuicSession> QuicClient::CreateQuicClientSession(
const ParsedQuicVersionVector& supported_versions,
QuicConnection* connection) {
- return QuicMakeUnique<QuicSimpleClientSession>(
+ return std::make_unique<QuicSimpleClientSession>(
*config(), supported_versions, connection, server_id(), crypto_config(),
push_promise_index(), drop_response_body());
}
diff --git a/quic/tools/quic_client_interop_test_bin.cc b/quic/tools/quic_client_interop_test_bin.cc
index 39f8ff9..a99f66a 100644
--- a/quic/tools/quic_client_interop_test_bin.cc
+++ b/quic/tools/quic_client_interop_test_bin.cc
@@ -55,9 +55,9 @@
QuicServerId server_id,
ParsedQuicVersionVector versions) {
std::set<Feature> features;
- auto proof_verifier = QuicMakeUnique<FakeProofVerifier>();
+ auto proof_verifier = std::make_unique<FakeProofVerifier>();
QuicEpollServer epoll_server;
- auto client = QuicMakeUnique<QuicClient>(
+ auto client = std::make_unique<QuicClient>(
addr, server_id, versions, &epoll_server, std::move(proof_verifier));
if (!client->Initialize()) {
return features;
diff --git a/quic/tools/quic_client_test.cc b/quic/tools/quic_client_test.cc
index e2d7f14..6b99d02 100644
--- a/quic/tools/quic_client_test.cc
+++ b/quic/tools/quic_client_test.cc
@@ -69,7 +69,7 @@
QuicSocketAddress server_address(QuicSocketAddress(TestLoopback(), port));
QuicServerId server_id("hostname", server_address.port(), false);
ParsedQuicVersionVector versions = AllSupportedVersions();
- auto client = QuicMakeUnique<QuicClient>(
+ auto client = std::make_unique<QuicClient>(
server_address, server_id, versions, &epoll_server_,
crypto_test_utils::ProofVerifierForTesting());
EXPECT_TRUE(client->Initialize());
diff --git a/quic/tools/quic_epoll_client_factory.cc b/quic/tools/quic_epoll_client_factory.cc
index 7cfb00a..bad090d 100644
--- a/quic/tools/quic_epoll_client_factory.cc
+++ b/quic/tools/quic_epoll_client_factory.cc
@@ -27,8 +27,8 @@
return nullptr;
}
QuicServerId server_id(host_for_handshake, port, false);
- return QuicMakeUnique<QuicClient>(addr, server_id, versions, &epoll_server_,
- std::move(verifier));
+ return std::make_unique<QuicClient>(addr, server_id, versions, &epoll_server_,
+ std::move(verifier));
}
} // namespace quic
diff --git a/quic/tools/quic_epoll_server_factory.cc b/quic/tools/quic_epoll_server_factory.cc
index f0c206a..9662658 100644
--- a/quic/tools/quic_epoll_server_factory.cc
+++ b/quic/tools/quic_epoll_server_factory.cc
@@ -11,8 +11,7 @@
std::unique_ptr<quic::QuicSpdyServerBase> QuicEpollServerFactory::CreateServer(
quic::QuicSimpleServerBackend* backend,
std::unique_ptr<quic::ProofSource> proof_source) {
- return quic::QuicMakeUnique<quic::QuicServer>(std::move(proof_source),
- backend);
+ return std::make_unique<quic::QuicServer>(std::move(proof_source), backend);
}
} // namespace quic
diff --git a/quic/tools/quic_memory_cache_backend.cc b/quic/tools/quic_memory_cache_backend.cc
index 5943380..aa0d273 100644
--- a/quic/tools/quic_memory_cache_backend.cc
+++ b/quic/tools/quic_memory_cache_backend.cc
@@ -341,7 +341,7 @@
QUIC_BUG << "Response for '" << key << "' already exists!";
return;
}
- auto new_response = QuicMakeUnique<QuicBackendResponse>();
+ auto new_response = std::make_unique<QuicBackendResponse>();
new_response->set_response_type(response_type);
new_response->set_headers(std::move(response_headers));
new_response->set_body(response_body);
diff --git a/quic/tools/quic_simple_client_session.cc b/quic/tools/quic_simple_client_session.cc
index 7cc875b..b7743f8 100644
--- a/quic/tools/quic_simple_client_session.cc
+++ b/quic/tools/quic_simple_client_session.cc
@@ -10,7 +10,7 @@
std::unique_ptr<QuicSpdyClientStream>
QuicSimpleClientSession::CreateClientStream() {
- return QuicMakeUnique<QuicSimpleClientStream>(
+ return std::make_unique<QuicSimpleClientStream>(
GetNextOutgoingBidirectionalStreamId(), this, BIDIRECTIONAL,
drop_response_body_);
}
diff --git a/quic/tools/quic_simple_server_session_test.cc b/quic/tools/quic_simple_server_session_test.cc
index 6cc97ed..b21d9fa 100644
--- a/quic/tools/quic_simple_server_session_test.cc
+++ b/quic/tools/quic_simple_server_session_test.cc
@@ -82,11 +82,10 @@
QuicCompressedCertsCache* compressed_certs_cache,
QuicServerSessionBase* session,
QuicCryptoServerStream::Helper* helper)
- : QuicCryptoServerStream(
- crypto_config,
- compressed_certs_cache,
- session,
- helper) {}
+ : QuicCryptoServerStream(crypto_config,
+ compressed_certs_cache,
+ session,
+ helper) {}
MockQuicCryptoServerStream(const MockQuicCryptoServerStream&) = delete;
MockQuicCryptoServerStream& operator=(const MockQuicCryptoServerStream&) =
delete;
@@ -215,7 +214,7 @@
connection_ = new StrictMock<MockQuicConnectionWithSendStreamData>(
&helper_, &alarm_factory_, Perspective::IS_SERVER, supported_versions);
connection_->AdvanceTime(QuicTime::Delta::FromSeconds(1));
- session_ = QuicMakeUnique<MockQuicSimpleServerSession>(
+ session_ = std::make_unique<MockQuicSimpleServerSession>(
config_, connection_, &owner_, &stream_helper_, &crypto_config_,
&compressed_certs_cache_, &memory_cache_backend_);
MockClock clock;
@@ -567,7 +566,7 @@
ParsedQuicVersionVector supported_versions = SupportedVersions(GetParam());
connection_ = new StrictMock<MockQuicConnectionWithSendStreamData>(
&helper_, &alarm_factory_, Perspective::IS_SERVER, supported_versions);
- session_ = QuicMakeUnique<MockQuicSimpleServerSession>(
+ session_ = std::make_unique<MockQuicSimpleServerSession>(
config_, connection_, &owner_, &stream_helper_, &crypto_config_,
&compressed_certs_cache_, &memory_cache_backend_);
session_->Initialize();
diff --git a/quic/tools/quic_spdy_client_base.cc b/quic/tools/quic_spdy_client_base.cc
index 09a1998..492091c 100644
--- a/quic/tools/quic_spdy_client_base.cc
+++ b/quic/tools/quic_spdy_client_base.cc
@@ -99,7 +99,7 @@
std::unique_ptr<QuicSession> QuicSpdyClientBase::CreateQuicClientSession(
const quic::ParsedQuicVersionVector& supported_versions,
QuicConnection* connection) {
- return QuicMakeUnique<QuicSpdyClientSession>(
+ return std::make_unique<QuicSpdyClientSession>(
*config(), supported_versions, connection, server_id(), crypto_config(),
&push_promise_index_);
}
diff --git a/quic/tools/quic_toy_client.cc b/quic/tools/quic_toy_client.cc
index a55382a..b843221 100644
--- a/quic/tools/quic_toy_client.cc
+++ b/quic/tools/quic_toy_client.cc
@@ -209,7 +209,7 @@
const int32_t num_requests(GetQuicFlag(FLAGS_num_requests));
std::unique_ptr<quic::ProofVerifier> proof_verifier;
if (GetQuicFlag(FLAGS_disable_certificate_verification)) {
- proof_verifier = quic::QuicMakeUnique<FakeProofVerifier>();
+ proof_verifier = std::make_unique<FakeProofVerifier>();
} else {
proof_verifier = quic::CreateDefaultProofVerifier(url.host());
}
diff --git a/quic/tools/quic_toy_server.cc b/quic/tools/quic_toy_server.cc
index 9fb15eb..39f206f 100644
--- a/quic/tools/quic_toy_server.cc
+++ b/quic/tools/quic_toy_server.cc
@@ -36,7 +36,7 @@
std::unique_ptr<quic::QuicSimpleServerBackend>
QuicToyServer::MemoryCacheBackendFactory::CreateBackend() {
- auto memory_cache_backend = QuicMakeUnique<QuicMemoryCacheBackend>();
+ auto memory_cache_backend = std::make_unique<QuicMemoryCacheBackend>();
if (!GetQuicFlag(FLAGS_quic_response_cache_dir).empty()) {
memory_cache_backend->InitializeBackend(
GetQuicFlag(FLAGS_quic_response_cache_dir));
