Index: net/tools/quic/quic_spdy_server_stream_test.cc |
diff --git a/net/tools/quic/quic_spdy_server_stream_test.cc b/net/tools/quic/quic_spdy_server_stream_test.cc |
index e01569ede7913214ba117ae9fd8f1948e0448bbf..f5bd17fde6b02da76e1e806229171c91d4a98156 100644 |
--- a/net/tools/quic/quic_spdy_server_stream_test.cc |
+++ b/net/tools/quic/quic_spdy_server_stream_test.cc |
@@ -115,7 +115,7 @@ class QuicSpdyServerStreamTest : public ::testing::TestWithParam<QuicVersion> { |
// Check if response already exists and matches. |
const QuicInMemoryCache::Response* cached_response = |
cache->GetResponse(request_headers); |
- if (cached_response != NULL) { |
+ if (cached_response != nullptr) { |
string cached_response_headers_str, response_headers_str; |
cached_response->headers().DumpToString(&cached_response_headers_str); |
response_headers.DumpToString(&response_headers_str); |
@@ -213,8 +213,7 @@ TEST_P(QuicSpdyServerStreamTest, TestSendResponse) { |
response_headers_.ReplaceOrAppendHeader("content-length", "3"); |
InSequence s; |
- EXPECT_CALL(session_, |
- WritevData(kHeadersStreamId, _, 0, false, _, NULL)); |
+ EXPECT_CALL(session_, WritevData(kHeadersStreamId, _, 0, false, _, nullptr)); |
EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(1). |
WillOnce(Return(QuicConsumedData(3, true))); |
@@ -229,8 +228,7 @@ TEST_P(QuicSpdyServerStreamTest, TestSendErrorResponse) { |
response_headers_.ReplaceOrAppendHeader("content-length", "3"); |
InSequence s; |
- EXPECT_CALL(session_, |
- WritevData(kHeadersStreamId, _, 0, false, _, NULL)); |
+ EXPECT_CALL(session_, WritevData(kHeadersStreamId, _, 0, false, _, nullptr)); |
EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(1). |
WillOnce(Return(QuicConsumedData(3, true))); |