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

net/quic/crypto/aes_128_gcm_12_decrypter_test.cc

Index: net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
diff --git a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
index b0f5f5cde1b4c0e8d2db65d121ab98dfb6cf3632..27afc290ec7148afff0630f955d0ee22b403e7be 100644
--- a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
+++ b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
@@ -53,7 +53,7 @@ struct TestGroupInfo {
 };
 
 // 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:
@@ -80,20 +80,20 @@ const TestVector test_group_0[] = {
     {
         "a49a5e26a2f8cb63d05546c2a62f5343", "907763b19b9b4ab6bd4f0281", "", "",
         "a2be08210d8c470a8df6e8fbd79ec5cf",
-        NULL  // FAIL
+        nullptr  // FAIL
     },
-    {NULL}};
+    {nullptr}};
 
 const TestVector test_group_1[] = {
     {
         "d1f6af919cde85661208bdce0c27cb22", "898c6929b435017bf031c3c5", "",
         "7c5faa40e636bbc91107e68010c92b9f", "ae45f11777540a2caeb128be8092468a",
-        NULL  // FAIL
+        nullptr  // FAIL
     },
     {"2370e320d4344208e0ff5683f243b213", "04dbb82f044d30831c441228", "",
      "d43a8e5089eea0d026c03a85178b27da", "2a049c049d25aa95969b451d93c31c6e",
      ""},
-    {NULL}};
+    {nullptr}};
 
 const TestVector test_group_2[] = {
     {"e98b72a9881a84ca6b76e0f43e68647a", "8b23299fde174053f3d652ba",
@@ -106,9 +106,9 @@ const TestVector test_group_2[] = {
         "5164df856f1e9cac04a79b808dc5be39", "e76925d5355e0584ce871b2b",
         "0216c899c88d6e32c958c7e553daa5bc", "",
         "a145319896329c96df291f64efbe0e3a",
-        NULL  // FAIL
+        nullptr  // FAIL
     },
-    {NULL}};
+    {nullptr}};
 
 const TestVector test_group_3[] = {
     {"af57f42c60c0fc5a09adb81ab86ca1c3", "a2dc01871f37025dc0fc9a79",
@@ -131,9 +131,9 @@ const TestVector test_group_3[] = {
         "32b992760b3a5f99e9a47838867000a9",
         "93c4fc6a4135f54d640b0c976bf755a06a292c33",
         "8ca4e38aa3dfa6b1d0297021ccf3ea5f",
-        NULL  // FAIL
+        nullptr  // FAIL
     },
-    {NULL}};
+    {nullptr}};
 
 const TestVector test_group_4[] = {
     {"da2bb7d581493d692380c77105590201", "44aa3e7856ca279d2eb020c6",
@@ -162,9 +162,9 @@ const TestVector test_group_4[] = {
         "139f155d1e8ce4ee76aaeefcd245baa0fc519f83a5fb9ad9aa40c4b21126013f576c42"
         "72c2cb136c8fd091cc4539877a5d1e72d607f960",
         "8b347853f11d75e81e8a95010be81f17",
-        NULL  // FAIL
+        nullptr  // FAIL
     },
-    {NULL}};
+    {nullptr}};
 
 const TestVector test_group_5[] = {
     {"387218b246c1a8257748b56980e50c94", "dd7e014198672be39f95b69d",
@@ -179,9 +179,9 @@ const TestVector test_group_5[] = {
     {
         "7d7b6c988137b8d470c57bf674a09c87", "9edf2aa970d016ac962e1fd8",
         "a85b66c3cb5eab91d5bdc8bc0e", "", "dc054efc01f3afd21d9c2484819f569a",
-        NULL  // FAIL
+        nullptr  // FAIL
     },
-    {NULL}};
+    {nullptr}};
 
 const TestVector* const test_group_array[] = {
     test_group_0, test_group_1, test_group_2,