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/core/crypto/cert_compressor.cc b/quic/core/crypto/cert_compressor.cc
index 9ad2fc8..09973dd 100644
--- a/quic/core/crypto/cert_compressor.cc
+++ b/quic/core/crypto/cert_compressor.cc
@@ -577,7 +577,7 @@
return false;
}
- uncompressed_data = QuicMakeUnique<uint8_t[]>(uncompressed_size);
+ uncompressed_data = std::make_unique<uint8_t[]>(uncompressed_size);
z_stream z;
ScopedZLib scoped_z(ScopedZLib::INFLATE);
diff --git a/quic/core/crypto/crypto_framer.cc b/quic/core/crypto/crypto_framer.cc
index 931ac99..ffddb81 100644
--- a/quic/core/crypto/crypto_framer.cc
+++ b/quic/core/crypto/crypto_framer.cc
@@ -32,7 +32,7 @@
void OnError(CryptoFramer* /*framer*/) override { error_ = true; }
void OnHandshakeMessage(const CryptoHandshakeMessage& message) override {
- out_ = QuicMakeUnique<CryptoHandshakeMessage>(message);
+ out_ = std::make_unique<CryptoHandshakeMessage>(message);
}
bool error() const { return error_; }
@@ -230,7 +230,7 @@
}
}
- return QuicMakeUnique<QuicData>(buffer.release(), len, true);
+ return std::make_unique<QuicData>(buffer.release(), len, true);
}
void CryptoFramer::Clear() {
diff --git a/quic/core/crypto/crypto_server_test.cc b/quic/core/crypto/crypto_server_test.cc
index 3216ea8..c3ca92c 100644
--- a/quic/core/crypto/crypto_server_test.cc
+++ b/quic/core/crypto/crypto_server_test.cc
@@ -218,7 +218,7 @@
config_.ValidateClientHello(
message, client_address_.host(), server_address,
supported_versions_.front().transport_version, &clock_, signed_config_,
- QuicMakeUnique<ValidateCallback>(this, true, "", &called));
+ std::make_unique<ValidateCallback>(this, true, "", &called));
EXPECT_TRUE(called);
}
@@ -236,7 +236,7 @@
config_.ValidateClientHello(
message, client_address_.host(), server_address,
supported_versions_.front().transport_version, &clock_, signed_config_,
- QuicMakeUnique<ValidateCallback>(this, false, error_substr, called));
+ std::make_unique<ValidateCallback>(this, false, error_substr, called));
}
class ProcessCallback : public ProcessClientHelloResultCallback {
@@ -297,8 +297,8 @@
supported_versions_.front(), supported_versions_, &clock_, rand_,
&compressed_certs_cache_, params_, signed_config_,
/*total_framing_overhead=*/50, chlo_packet_size_,
- QuicMakeUnique<ProcessCallback>(result, should_succeed, error_substr,
- &called, &out_));
+ std::make_unique<ProcessCallback>(result, should_succeed, error_substr,
+ &called, &out_));
EXPECT_TRUE(called);
}
diff --git a/quic/core/crypto/crypto_utils.cc b/quic/core/crypto/crypto_utils.cc
index 642799e..89d5379 100644
--- a/quic/core/crypto/crypto_utils.cc
+++ b/quic/core/crypto/crypto_utils.cc
@@ -134,12 +134,12 @@
encryption_label = server_label;
decryption_label = client_label;
}
- crypters->encrypter = QuicMakeUnique<Aes128GcmEncrypter>();
+ crypters->encrypter = std::make_unique<Aes128GcmEncrypter>();
std::vector<uint8_t> encryption_secret = HkdfExpandLabel(
hash, handshake_secret, encryption_label, EVP_MD_size(hash));
SetKeyAndIV(hash, encryption_secret, crypters->encrypter.get());
- crypters->decrypter = QuicMakeUnique<Aes128GcmDecrypter>();
+ crypters->decrypter = std::make_unique<Aes128GcmDecrypter>();
std::vector<uint8_t> decryption_secret = HkdfExpandLabel(
hash, handshake_secret, decryption_label, EVP_MD_size(hash));
SetKeyAndIV(hash, decryption_secret, crypters->decrypter.get());
@@ -191,7 +191,7 @@
pre_shared_key.size() + 8 +
premaster_secret.size() + 8;
- psk_premaster_secret = QuicMakeUnique<char[]>(psk_premaster_secret_size);
+ psk_premaster_secret = std::make_unique<char[]>(psk_premaster_secret_size);
QuicDataWriter writer(psk_premaster_secret_size, psk_premaster_secret.get(),
HOST_BYTE_ORDER);
diff --git a/quic/core/crypto/curve25519_key_exchange_test.cc b/quic/core/crypto/curve25519_key_exchange_test.cc
index 93aa298..aeaf52f 100644
--- a/quic/core/crypto/curve25519_key_exchange_test.cc
+++ b/quic/core/crypto/curve25519_key_exchange_test.cc
@@ -84,13 +84,14 @@
std::string alice_shared, bob_shared;
TestCallbackResult alice_result;
ASSERT_FALSE(alice_result.ok());
- alice->CalculateSharedKeyAsync(bob_public, &alice_shared,
- QuicMakeUnique<TestCallback>(&alice_result));
+ alice->CalculateSharedKeyAsync(
+ bob_public, &alice_shared,
+ std::make_unique<TestCallback>(&alice_result));
ASSERT_TRUE(alice_result.ok());
TestCallbackResult bob_result;
ASSERT_FALSE(bob_result.ok());
bob->CalculateSharedKeyAsync(alice_public, &bob_shared,
- QuicMakeUnique<TestCallback>(&bob_result));
+ std::make_unique<TestCallback>(&bob_result));
ASSERT_TRUE(bob_result.ok());
ASSERT_EQ(alice_shared, bob_shared);
ASSERT_NE(0u, alice_shared.length());
diff --git a/quic/core/crypto/p256_key_exchange_test.cc b/quic/core/crypto/p256_key_exchange_test.cc
index 34a4993..694fb62 100644
--- a/quic/core/crypto/p256_key_exchange_test.cc
+++ b/quic/core/crypto/p256_key_exchange_test.cc
@@ -89,13 +89,14 @@
std::string alice_shared, bob_shared;
TestCallbackResult alice_result;
ASSERT_FALSE(alice_result.ok());
- alice->CalculateSharedKeyAsync(bob_public, &alice_shared,
- QuicMakeUnique<TestCallback>(&alice_result));
+ alice->CalculateSharedKeyAsync(
+ bob_public, &alice_shared,
+ std::make_unique<TestCallback>(&alice_result));
ASSERT_TRUE(alice_result.ok());
TestCallbackResult bob_result;
ASSERT_FALSE(bob_result.ok());
bob->CalculateSharedKeyAsync(alice_public, &bob_shared,
- QuicMakeUnique<TestCallback>(&bob_result));
+ std::make_unique<TestCallback>(&bob_result));
ASSERT_TRUE(bob_result.ok());
ASSERT_EQ(alice_shared, bob_shared);
ASSERT_NE(0u, alice_shared.length());
diff --git a/quic/core/crypto/quic_crypto_server_config.cc b/quic/core/crypto/quic_crypto_server_config.cc
index 862dc62..95705e5 100644
--- a/quic/core/crypto/quic_crypto_server_config.cc
+++ b/quic/core/crypto/quic_crypto_server_config.cc
@@ -118,7 +118,7 @@
// static
std::unique_ptr<KeyExchangeSource> KeyExchangeSource::Default() {
- return QuicMakeUnique<DefaultKeyExchangeSource>();
+ return std::make_unique<DefaultKeyExchangeSource>();
}
class ValidateClientHelloHelper {
@@ -665,7 +665,7 @@
QuicByteCount chlo_packet_size,
std::unique_ptr<ProcessClientHelloResultCallback> done_cb) const {
DCHECK(done_cb);
- auto context = QuicMakeUnique<ProcessClientHelloContext>(
+ auto context = std::make_unique<ProcessClientHelloContext>(
validate_chlo_result, reject_only, connection_id, server_address,
client_address, version, supported_versions, clock, rand,
compressed_certs_cache, params, signed_config, total_framing_overhead,
@@ -709,7 +709,7 @@
const std::string sni = std::string(context->info().sni);
const QuicTransportVersion transport_version = context->transport_version();
- auto cb = QuicMakeUnique<ProcessClientHelloCallback>(
+ auto cb = std::make_unique<ProcessClientHelloCallback>(
this, std::move(context), configs);
DCHECK(proof_source_.get());
@@ -739,7 +739,7 @@
return;
}
- auto out_diversification_nonce = QuicMakeUnique<DiversificationNonce>();
+ auto out_diversification_nonce = std::make_unique<DiversificationNonce>();
QuicStringPiece cert_sct;
if (context->client_hello().GetStringPiece(kCertificateSCTTag, &cert_sct) &&
@@ -747,7 +747,7 @@
context->params()->sct_supported_by_client = true;
}
- auto out = QuicMakeUnique<CryptoHandshakeMessage>();
+ auto out = std::make_unique<CryptoHandshakeMessage>();
if (!context->info().reject_reasons.empty() || !configs.requested) {
BuildRejectionAndRecordStats(*context, *configs.primary,
context->info().reject_reasons, out.get());
@@ -795,7 +795,7 @@
configs.requested->key_exchanges[key_exchange_index].get();
std::string* initial_premaster_secret =
&context->params()->initial_premaster_secret;
- auto cb = QuicMakeUnique<ProcessClientHelloAfterGetProofCallback>(
+ auto cb = std::make_unique<ProcessClientHelloAfterGetProofCallback>(
this, std::move(proof_source_details), key_exchange->type(),
std::move(out), public_value, std::move(context), configs);
key_exchange->CalculateSharedKeyAsync(public_value, initial_premaster_secret,
@@ -920,7 +920,7 @@
hkdf_input.append(QuicCryptoConfig::kInitialLabel, label_len);
hkdf_input.append(hkdf_suffix);
- auto out_diversification_nonce = QuicMakeUnique<DiversificationNonce>();
+ auto out_diversification_nonce = std::make_unique<DiversificationNonce>();
context->rand()->RandBytes(out_diversification_nonce->data(),
out_diversification_nonce->size());
CryptoUtils::Diversification diversification =
@@ -1009,7 +1009,7 @@
const std::string sni(context->info().sni);
const QuicTransportVersion transport_version = context->transport_version();
- auto cb = QuicMakeUnique<SendRejectWithFallbackConfigCallback>(
+ auto cb = std::make_unique<SendRejectWithFallbackConfigCallback>(
this, std::move(context), fallback_config);
proof_source_->GetProof(server_address, sni, fallback_config->serialized,
transport_version, chlo_hash, std::move(cb));
@@ -1025,12 +1025,12 @@
return;
}
- auto out = QuicMakeUnique<CryptoHandshakeMessage>();
+ auto out = std::make_unique<CryptoHandshakeMessage>();
BuildRejectionAndRecordStats(*context, *fallback_config,
{SERVER_CONFIG_UNKNOWN_CONFIG_FAILURE},
out.get());
- context->Succeed(std::move(out), QuicMakeUnique<DiversificationNonce>(),
+ context->Succeed(std::move(out), std::make_unique<DiversificationNonce>(),
std::move(proof_source_details));
}
@@ -1320,7 +1320,7 @@
message.SetStringPiece(kSourceAddressTokenTag, source_address_token);
auto proof_source_cb =
- QuicMakeUnique<BuildServerConfigUpdateMessageProofSourceCallback>(
+ std::make_unique<BuildServerConfigUpdateMessageProofSourceCallback>(
this, compressed_certs_cache, common_cert_sets, params,
std::move(message), std::move(cb));
diff --git a/quic/core/crypto/quic_decrypter.cc b/quic/core/crypto/quic_decrypter.cc
index 79369f0..2fb1deb 100644
--- a/quic/core/crypto/quic_decrypter.cc
+++ b/quic/core/crypto/quic_decrypter.cc
@@ -25,9 +25,9 @@
std::unique_ptr<QuicDecrypter> QuicDecrypter::Create(QuicTag algorithm) {
switch (algorithm) {
case kAESG:
- return QuicMakeUnique<Aes128Gcm12Decrypter>();
+ return std::make_unique<Aes128Gcm12Decrypter>();
case kCC20:
- return QuicMakeUnique<ChaCha20Poly1305Decrypter>();
+ return std::make_unique<ChaCha20Poly1305Decrypter>();
default:
QUIC_LOG(FATAL) << "Unsupported algorithm: " << algorithm;
return nullptr;
@@ -39,11 +39,11 @@
uint32_t cipher_suite) {
switch (cipher_suite) {
case TLS1_CK_AES_128_GCM_SHA256:
- return QuicMakeUnique<Aes128GcmDecrypter>();
+ return std::make_unique<Aes128GcmDecrypter>();
case TLS1_CK_AES_256_GCM_SHA384:
- return QuicMakeUnique<Aes256GcmDecrypter>();
+ return std::make_unique<Aes256GcmDecrypter>();
case TLS1_CK_CHACHA20_POLY1305_SHA256:
- return QuicMakeUnique<ChaCha20Poly1305TlsDecrypter>();
+ return std::make_unique<ChaCha20Poly1305TlsDecrypter>();
default:
QUIC_BUG << "TLS cipher suite is unknown to QUIC";
return nullptr;
diff --git a/quic/core/crypto/quic_encrypter.cc b/quic/core/crypto/quic_encrypter.cc
index f264bfd..f6b2490 100644
--- a/quic/core/crypto/quic_encrypter.cc
+++ b/quic/core/crypto/quic_encrypter.cc
@@ -22,9 +22,9 @@
std::unique_ptr<QuicEncrypter> QuicEncrypter::Create(QuicTag algorithm) {
switch (algorithm) {
case kAESG:
- return QuicMakeUnique<Aes128Gcm12Encrypter>();
+ return std::make_unique<Aes128Gcm12Encrypter>();
case kCC20:
- return QuicMakeUnique<ChaCha20Poly1305Encrypter>();
+ return std::make_unique<ChaCha20Poly1305Encrypter>();
default:
QUIC_LOG(FATAL) << "Unsupported algorithm: " << algorithm;
return nullptr;
@@ -36,11 +36,11 @@
uint32_t cipher_suite) {
switch (cipher_suite) {
case TLS1_CK_AES_128_GCM_SHA256:
- return QuicMakeUnique<Aes128GcmEncrypter>();
+ return std::make_unique<Aes128GcmEncrypter>();
case TLS1_CK_AES_256_GCM_SHA384:
- return QuicMakeUnique<Aes256GcmEncrypter>();
+ return std::make_unique<Aes256GcmEncrypter>();
case TLS1_CK_CHACHA20_POLY1305_SHA256:
- return QuicMakeUnique<ChaCha20Poly1305TlsEncrypter>();
+ return std::make_unique<ChaCha20Poly1305TlsEncrypter>();
default:
QUIC_BUG << "TLS cipher suite is unknown to QUIC";
return nullptr;
diff --git a/quic/core/crypto/transport_parameters.cc b/quic/core/crypto/transport_parameters.cc
index 8f2349c..8e4fa40 100644
--- a/quic/core/crypto/transport_parameters.cc
+++ b/quic/core/crypto/transport_parameters.cc
@@ -706,7 +706,7 @@
preferred_address.stateless_reset_token.assign(
CBS_data(&value), CBS_data(&value) + CBS_len(&value));
out->preferred_address =
- QuicMakeUnique<TransportParameters::PreferredAddress>(
+ std::make_unique<TransportParameters::PreferredAddress>(
preferred_address);
} break;
case TransportParameters::kActiveConnectionIdLimit:
diff --git a/quic/core/crypto/transport_parameters_test.cc b/quic/core/crypto/transport_parameters_test.cc
index 7379224..e782c38 100644
--- a/quic/core/crypto/transport_parameters_test.cc
+++ b/quic/core/crypto/transport_parameters_test.cc
@@ -73,7 +73,7 @@
preferred_address.ipv6_socket_address = CreateFakeV6SocketAddress();
preferred_address.connection_id = kFakePreferredConnectionId;
preferred_address.stateless_reset_token = kFakePreferredStatelessResetToken;
- return QuicMakeUnique<TransportParameters::PreferredAddress>(
+ return std::make_unique<TransportParameters::PreferredAddress>(
preferred_address);
}
@@ -594,7 +594,7 @@
orig_params.version = kFakeVersionLabel;
orig_params.max_packet_size.set_value(kFakeMaxPacketSize);
- orig_params.google_quic_params = QuicMakeUnique<CryptoHandshakeMessage>();
+ orig_params.google_quic_params = std::make_unique<CryptoHandshakeMessage>();
const std::string kTestString = "test string";
orig_params.google_quic_params->SetStringPiece(42, kTestString);
const uint32_t kTestValue = 12;
