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

net/quic/crypto/quic_crypto_server_config_test.cc

Index: net/quic/crypto/quic_crypto_server_config_test.cc
diff --git a/net/quic/crypto/quic_crypto_server_config_test.cc b/net/quic/crypto/quic_crypto_server_config_test.cc
index cbb07e6146cad30e4b04165e3ac2ef5a18365d2f..d7a887ed83757b4eab87133aae0110bb9c36b3f8 100644
--- a/net/quic/crypto/quic_crypto_server_config_test.cc
+++ b/net/quic/crypto/quic_crypto_server_config_test.cc
@@ -274,14 +274,14 @@ class SourceAddressTokenTest : public ::testing::Test {
   }
 
   string NewSourceAddressToken(string config_id, const IPAddressNumber& ip) {
-    return NewSourceAddressToken(config_id, ip, NULL);
+    return NewSourceAddressToken(config_id, ip, nullptr);
   }
 
   string NewSourceAddressToken(string config_id,
                                const IPAddressNumber& ip,
                                const SourceAddressTokens& previous_tokens) {
     return peer_.NewSourceAddressToken(config_id, previous_tokens, ip, rand_,
-                                       clock_.WallNow(), NULL);
+                                       clock_.WallNow(), nullptr);
   }
 
   string NewSourceAddressToken(string config_id,
@@ -296,7 +296,7 @@ class SourceAddressTokenTest : public ::testing::Test {
       string config_id,
       StringPiece srct,
       const IPAddressNumber& ip) {
-    return ValidateSourceAddressTokens(config_id, srct, ip, NULL);
+    return ValidateSourceAddressTokens(config_id, srct, ip, nullptr);
   }
 
   HandshakeFailureReason ValidateSourceAddressTokens(