| Index: net/quic/crypto/crypto_framer_test.cc
|
| diff --git a/net/quic/crypto/crypto_framer_test.cc b/net/quic/crypto/crypto_framer_test.cc
|
| index 4486f595eeeda3c13b9a7f0568f548f1856448c7..01e9157dcd7b78eea92060adc5e9e8d8b8398f35 100644
|
| --- a/net/quic/crypto/crypto_framer_test.cc
|
| +++ b/net/quic/crypto/crypto_framer_test.cc
|
| @@ -88,7 +88,7 @@ TEST(CryptoFramerTest, ConstructHandshakeMessage) {
|
|
|
| CryptoFramer framer;
|
| scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message));
|
| - ASSERT_TRUE(data.get() != NULL);
|
| + ASSERT_TRUE(data.get() != nullptr);
|
| test::CompareCharArraysWithHexError("constructed packet", data->data(),
|
| data->length(), AsChars(packet),
|
| arraysize(packet));
|
| @@ -125,7 +125,7 @@ TEST(CryptoFramerTest, ConstructHandshakeMessageWithTwoKeys) {
|
|
|
| CryptoFramer framer;
|
| scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message));
|
| - ASSERT_TRUE(data.get() != NULL);
|
| + ASSERT_TRUE(data.get() != nullptr);
|
|
|
| test::CompareCharArraysWithHexError("constructed packet", data->data(),
|
| data->length(), AsChars(packet),
|
| @@ -152,7 +152,7 @@ TEST(CryptoFramerTest, ConstructHandshakeMessageZeroLength) {
|
|
|
| CryptoFramer framer;
|
| scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message));
|
| - ASSERT_TRUE(data.get() != NULL);
|
| + ASSERT_TRUE(data.get() != nullptr);
|
|
|
| test::CompareCharArraysWithHexError("constructed packet", data->data(),
|
| data->length(), AsChars(packet),
|
| @@ -168,7 +168,7 @@ TEST(CryptoFramerTest, ConstructHandshakeMessageTooManyEntries) {
|
|
|
| CryptoFramer framer;
|
| scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message));
|
| - EXPECT_TRUE(data.get() == NULL);
|
| + EXPECT_TRUE(data.get() == nullptr);
|
| }
|
|
|
| TEST(CryptoFramerTest, ConstructHandshakeMessageMinimumSize) {
|
| @@ -204,7 +204,7 @@ TEST(CryptoFramerTest, ConstructHandshakeMessageMinimumSize) {
|
|
|
| CryptoFramer framer;
|
| scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message));
|
| - ASSERT_TRUE(data.get() != NULL);
|
| + ASSERT_TRUE(data.get() != nullptr);
|
|
|
| test::CompareCharArraysWithHexError("constructed packet", data->data(),
|
| data->length(), AsChars(packet),
|
| @@ -242,7 +242,7 @@ TEST(CryptoFramerTest, ConstructHandshakeMessageMinimumSizePadLast) {
|
|
|
| CryptoFramer framer;
|
| scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message));
|
| - ASSERT_TRUE(data.get() != NULL);
|
| + ASSERT_TRUE(data.get() != nullptr);
|
|
|
| test::CompareCharArraysWithHexError("constructed packet", data->data(),
|
| data->length(), AsChars(packet),
|
|
|