Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Unified Diff: net/quic/test_tools/crypto_test_utils.cc

Issue 612323013: QUIC - (no behavior change) s/NULL/nullptr/g in .../quic/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/test_tools/crypto_test_utils.h ('k') | net/quic/test_tools/crypto_test_utils_chromium.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/test_tools/crypto_test_utils.cc
diff --git a/net/quic/test_tools/crypto_test_utils.cc b/net/quic/test_tools/crypto_test_utils.cc
index 86ff6422460a70b34c74b413331195290a7a28ae..cf8df9aab3f213fe7a74e673ffcaabe6d4ffb40e 100644
--- a/net/quic/test_tools/crypto_test_utils.cc
+++ b/net/quic/test_tools/crypto_test_utils.cc
@@ -130,7 +130,7 @@ bool HexChar(char c, uint8* value) {
}
// A ChannelIDSource that works in asynchronous mode unless the |callback|
-// argument to GetChannelIDKey is NULL.
+// argument to GetChannelIDKey is nullptr.
class AsyncTestChannelIDSource : public ChannelIDSource,
public CryptoTestUtils::CallbackSource {
public:
@@ -146,12 +146,12 @@ class AsyncTestChannelIDSource : public ChannelIDSource,
ChannelIDSourceCallback* callback) OVERRIDE {
// Synchronous mode.
if (!callback) {
- return sync_source_->GetChannelIDKey(hostname, channel_id_key, NULL);
+ return sync_source_->GetChannelIDKey(hostname, channel_id_key, nullptr);
}
// Asynchronous mode.
QuicAsyncStatus status =
- sync_source_->GetChannelIDKey(hostname, &channel_id_key_, NULL);
+ sync_source_->GetChannelIDKey(hostname, &channel_id_key_, nullptr);
if (status != QUIC_SUCCESS) {
return QUIC_FAILURE;
}
@@ -227,7 +227,7 @@ int CryptoTestUtils::HandshakeWithFakeClient(
crypto_config.SetProofVerifier(FakeProofVerifierForTesting());
}
bool is_https = false;
- AsyncTestChannelIDSource* async_channel_id_source = NULL;
+ AsyncTestChannelIDSource* async_channel_id_source = nullptr;
if (options.channel_id_enabled) {
is_https = true;
@@ -255,10 +255,8 @@ int CryptoTestUtils::HandshakeWithFakeClient(
if (options.channel_id_enabled) {
scoped_ptr<ChannelIDKey> channel_id_key;
- QuicAsyncStatus status =
- crypto_config.channel_id_source()->GetChannelIDKey(kServerHostname,
- &channel_id_key,
- NULL);
+ QuicAsyncStatus status = crypto_config.channel_id_source()->GetChannelIDKey(
+ kServerHostname, &channel_id_key, nullptr);
EXPECT_EQ(QUIC_SUCCESS, status);
EXPECT_EQ(channel_id_key->SerializeKey(),
server->crypto_negotiated_params().channel_id);
@@ -288,7 +286,7 @@ void CryptoTestUtils::CommunicateHandshakeMessages(
QuicCryptoStream* a,
PacketSavingConnection* b_conn,
QuicCryptoStream* b) {
- CommunicateHandshakeMessagesAndRunCallbacks(a_conn, a, b_conn, b, NULL);
+ CommunicateHandshakeMessagesAndRunCallbacks(a_conn, a, b_conn, b, nullptr);
}
// static
@@ -580,7 +578,7 @@ CryptoHandshakeMessage CryptoTestUtils::BuildMessage(const char* message_tag,
for (;;) {
const char* tagstr = va_arg(ap, const char*);
- if (tagstr == NULL) {
+ if (tagstr == nullptr) {
break;
}
« no previous file with comments | « net/quic/test_tools/crypto_test_utils.h ('k') | net/quic/test_tools/crypto_test_utils_chromium.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698