Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2188)

Unified Diff: net/quic/quic_headers_stream_test.cc

Issue 612323013: QUIC - (no behavior change) s/NULL/nullptr/g in .../quic/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/quic_framer_test.cc ('k') | net/quic/quic_http_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_headers_stream_test.cc
diff --git a/net/quic/quic_headers_stream_test.cc b/net/quic/quic_headers_stream_test.cc
index aa9a01373d744051e330964cedca06281f39187f..32d22feb745fd49d675aa22c63eeb7c3185810ef 100644
--- a/net/quic/quic_headers_stream_test.cc
+++ b/net/quic/quic_headers_stream_test.cc
@@ -90,7 +90,7 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<bool> {
headers_["content-length"] = "11";
framer_.set_visitor(&visitor_);
EXPECT_EQ(QuicVersionMax(), session_.connection()->version());
- EXPECT_TRUE(headers_stream_ != NULL);
+ EXPECT_TRUE(headers_stream_ != nullptr);
}
QuicConsumedData SaveIov(const IOVector& data) {
@@ -127,9 +127,9 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<bool> {
QuicPriority priority,
SpdyFrameType type) {
// Write the headers and capture the outgoing data
- EXPECT_CALL(session_, WritevData(kHeadersStreamId, _, _, false, _, NULL))
+ EXPECT_CALL(session_, WritevData(kHeadersStreamId, _, _, false, _, nullptr))
.WillOnce(WithArgs<1>(Invoke(this, &QuicHeadersStreamTest::SaveIov)));
- headers_stream_->WriteHeaders(stream_id, headers_, fin, NULL);
+ headers_stream_->WriteHeaders(stream_id, headers_, fin, nullptr);
// Parse the outgoing data and check that it matches was was written.
if (type == SYN_STREAM) {
@@ -143,7 +143,7 @@ class QuicHeadersStreamTest : public ::testing::TestWithParam<bool> {
.WillRepeatedly(WithArgs<1, 2>(
Invoke(this, &QuicHeadersStreamTest::SaveHeaderData)));
if (fin) {
- EXPECT_CALL(visitor_, OnStreamFrameData(stream_id, NULL, 0, true));
+ EXPECT_CALL(visitor_, OnStreamFrameData(stream_id, nullptr, 0, true));
}
framer_.ProcessInput(saved_data_.data(), saved_data_.length());
EXPECT_FALSE(framer_.HasError()) << framer_.error_code();
« no previous file with comments | « net/quic/quic_framer_test.cc ('k') | net/quic/quic_http_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698