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

Unified Diff: net/quic/quic_stream_factory.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_spdy_server_stream.cc ('k') | net/quic/quic_stream_factory_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_stream_factory.cc
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index 6780528b5b3bed0a9cbd34d8f5dac3eab6617986..ccbca64a658e0c4cb84c0e761f6bf138d83e0e5d 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -234,7 +234,7 @@ QuicStreamFactory::Job::Job(QuicStreamFactory* factory,
was_alternate_protocol_recently_broken),
server_info_(server_info),
net_log_(net_log),
- session_(NULL),
+ session_(nullptr),
weak_factory_(this) {}
QuicStreamFactory::Job::Job(QuicStreamFactory* factory,
@@ -418,7 +418,7 @@ int QuicStreamFactory::Job::DoConnectComplete(int rv) {
AddressList address(session_->connection()->peer_address());
if (factory_->OnResolution(server_id_, address)) {
session_->connection()->SendConnectionClose(QUIC_CONNECTION_IP_POOLED);
- session_ = NULL;
+ session_ = nullptr;
return OK;
}
@@ -452,7 +452,7 @@ int QuicStreamRequest::Request(const HostPortPair& host_port_pair,
net_log_ = net_log;
callback_ = callback;
} else {
- factory_ = NULL;
+ factory_ = nullptr;
}
if (rv == OK)
DCHECK(stream_);
@@ -465,7 +465,7 @@ void QuicStreamRequest::set_stream(scoped_ptr<QuicHttpStream> stream) {
}
void QuicStreamRequest::OnRequestComplete(int rv) {
- factory_ = NULL;
+ factory_ = nullptr;
callback_.Run(rv);
}
@@ -496,7 +496,7 @@ QuicStreamFactory::QuicStreamFactory(
client_socket_factory_(client_socket_factory),
http_server_properties_(http_server_properties),
transport_security_state_(transport_security_state),
- quic_server_info_factory_(NULL),
+ quic_server_info_factory_(nullptr),
quic_crypto_client_stream_factory_(quic_crypto_client_stream_factory),
random_generator_(random_generator),
clock_(clock),
@@ -565,7 +565,7 @@ int QuicStreamFactory::Create(const HostPortPair& host_port_pair,
return ERR_IO_PENDING;
}
- QuicServerInfo* quic_server_info = NULL;
+ QuicServerInfo* quic_server_info = nullptr;
if (quic_server_info_factory_) {
QuicCryptoClientConfig::CachedState* cached =
crypto_config_.LookupOrCreate(server_id);
@@ -653,7 +653,7 @@ void QuicStreamFactory::OnJobComplete(Job* job, int rv) {
}
// Returns a newly created QuicHttpStream owned by the caller, if a
-// matching session already exists. Returns NULL otherwise.
+// matching session already exists. Returns nullptr otherwise.
scoped_ptr<QuicHttpStream> QuicStreamFactory::CreateIfSessionExists(
const QuicServerId& server_id,
const BoundNetLog& net_log) {
@@ -909,7 +909,7 @@ int QuicStreamFactory::CreateSession(
const HttpServerProperties::NetworkStats* stats =
http_server_properties_->GetServerNetworkStats(
server_id.host_port_pair());
- if (stats != NULL) {
+ if (stats != nullptr) {
config.SetInitialRoundTripTimeUsToSend(stats->srtt.InMicroseconds());
}
}
@@ -929,7 +929,7 @@ int QuicStreamFactory::CreateSession(
closed_during_initialize);
if (closed_during_initialize) {
DLOG(DFATAL) << "Session closed during initialize";
- *session = NULL;
+ *session = nullptr;
return ERR_CONNECTION_CLOSED;
}
return OK;
« no previous file with comments | « net/quic/quic_spdy_server_stream.cc ('k') | net/quic/quic_stream_factory_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698