Landing Recent QUIC changes until 12/18/2015 13:57 UTC

net/quic/crypto/chacha20_poly1305_decrypter_test.cc

Index: net/quic/crypto/chacha20_poly1305_decrypter_test.cc
diff --git a/net/quic/crypto/chacha20_poly1305_decrypter_test.cc b/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
index d38e9b5eefe71f6fc1c3e805eb79948825e9d032..665595dd7f553924cffc864b73725b1bfc6a4eb5 100644
--- a/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
+++ b/net/quic/crypto/chacha20_poly1305_decrypter_test.cc
@@ -14,7 +14,7 @@ namespace {
 // The test vectors come from draft-agl-tls-chacha20poly1305-04 Section 7.
 
 // Each test vector consists of six strings of lowercase hexadecimal digits.
-// The strings may be empty (zero length). A test vector with a NULL |key|
+// The strings may be empty (zero length). A test vector with a nullptr |key|
 // marks the end of an array of test vectors.
 struct TestVector {
   // Input:
@@ -42,7 +42,7 @@ const TestVector test_vectors[] = {
         "cd7cf67be39c794a", "87e229d4500845a079c0",
         "f3e446f7ede9a19b62a4677dabf4e3d24b876bb28475",  // "3896e1d6"
                                                          // truncated.
-        NULL                                             // FAIL
+        nullptr                                          // FAIL
     },
     // Modify the ciphertext (Poly1305 authenticator).
     {
@@ -51,7 +51,7 @@ const TestVector test_vectors[] = {
         "cd7cf67be39c794a", "87e229d4500845a079c0",
         "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28476",  // "3896e1d6"
                                                          // truncated.
-        NULL                                             // FAIL
+        nullptr                                          // FAIL
     },
     // Modify the associated data.
     {
@@ -60,9 +60,9 @@ const TestVector test_vectors[] = {
         "dd7cf67be39c794a", "87e229d4500845a079c0",
         "e3e446f7ede9a19b62a4677dabf4e3d24b876bb28475",  // "3896e1d6"
                                                          // truncated.
-        NULL                                             // FAIL
+        nullptr                                          // FAIL
     },
-    {NULL}};
+    {nullptr}};
 
 }  // namespace