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

Unified Diff: net/quic/quic_http_stream.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_headers_stream_test.cc ('k') | net/quic/quic_http_stream_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_http_stream.cc
diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc
index a069fa2cf509bbc878a4a41e2a6ab98780746967..4f8e4e4b84175f063735351a1fe07c56fa5fcbe5 100644
--- a/net/quic/quic_http_stream.cc
+++ b/net/quic/quic_http_stream.cc
@@ -30,11 +30,11 @@ QuicHttpStream::QuicHttpStream(const base::WeakPtr<QuicClientSession>& session)
session_(session),
session_error_(OK),
was_handshake_confirmed_(session->IsCryptoHandshakeConfirmed()),
- stream_(NULL),
- request_info_(NULL),
- request_body_stream_(NULL),
+ stream_(nullptr),
+ request_info_(nullptr),
+ request_body_stream_(nullptr),
priority_(MINIMUM_PRIORITY),
- response_info_(NULL),
+ response_info_(nullptr),
response_status_(OK),
response_headers_received_(false),
read_buf_(new GrowableIOBuffer()),
@@ -155,7 +155,7 @@ UploadProgress QuicHttpStream::GetUploadProgress() const {
int QuicHttpStream::ReadResponseHeaders(const CompletionCallback& callback) {
CHECK(!callback.is_null());
- if (stream_ == NULL)
+ if (stream_ == nullptr)
return response_status_;
// Check if we already have the response headers. If so, return synchronously.
@@ -216,16 +216,16 @@ void QuicHttpStream::Close(bool not_reusable) {
// Note: the not_reusable flag has no meaning for SPDY streams.
if (stream_) {
closed_stream_received_bytes_ = stream_->stream_bytes_read();
- stream_->SetDelegate(NULL);
+ stream_->SetDelegate(nullptr);
stream_->Reset(QUIC_STREAM_CANCELLED);
- stream_ = NULL;
+ stream_ = nullptr;
response_status_ = was_handshake_confirmed_ ?
ERR_CONNECTION_CLOSED : ERR_QUIC_HANDSHAKE_FAILED;
}
}
HttpStream* QuicHttpStream::RenewStreamForAuth() {
- return NULL;
+ return nullptr;
}
bool QuicHttpStream::IsResponseBodyComplete() const {
@@ -321,7 +321,7 @@ int QuicHttpStream::OnDataReceived(const char* data, int length) {
length = user_buffer_len_;
}
- user_buffer_ = NULL;
+ user_buffer_ = nullptr;
user_buffer_len_ = 0;
DoCallback(length);
return OK;
@@ -336,13 +336,13 @@ void QuicHttpStream::OnClose(QuicErrorCode error) {
}
closed_stream_received_bytes_ = stream_->stream_bytes_read();
- stream_ = NULL;
+ stream_ = nullptr;
if (!callback_.is_null())
DoCallback(response_status_);
}
void QuicHttpStream::OnError(int error) {
- stream_ = NULL;
+ stream_ = nullptr;
response_status_ = was_handshake_confirmed_ ?
error : ERR_QUIC_HANDSHAKE_FAILED;
if (!callback_.is_null())
@@ -434,10 +434,10 @@ int QuicHttpStream::DoSendHeaders() {
base::Bind(&QuicRequestNetLogCallback, stream_->id(), &request_headers_,
priority_));
- bool has_upload_data = request_body_stream_ != NULL;
+ bool has_upload_data = request_body_stream_ != nullptr;
next_state_ = STATE_SEND_HEADERS_COMPLETE;
- int rv = stream_->WriteHeaders(request_headers_, !has_upload_data, NULL);
+ int rv = stream_->WriteHeaders(request_headers_, !has_upload_data, nullptr);
request_headers_.clear();
return rv;
}
« no previous file with comments | « net/quic/quic_headers_stream_test.cc ('k') | net/quic/quic_http_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698