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

Unified Diff: net/socket/websocket_transport_client_socket_pool.cc

Issue 2341233002: Replace NULL with nullptr in WebSocket code in net/socket/ (Closed)
Patch Set: Rebase Created 4 years, 3 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
Index: net/socket/websocket_transport_client_socket_pool.cc
diff --git a/net/socket/websocket_transport_client_socket_pool.cc b/net/socket/websocket_transport_client_socket_pool.cc
index 00d20f8e8de5b4919e5a69df3f5015e14f6ce46f..db828b0d8515a9f0ac890bbde00a4009064c2046 100644
--- a/net/socket/websocket_transport_client_socket_pool.cc
+++ b/net/socket/websocket_transport_client_socket_pool.cc
@@ -287,7 +287,7 @@ WebSocketTransportClientSocketPool::WebSocketTransportClientSocketPool(
max_sockets_per_group,
host_resolver,
client_socket_factory,
- NULL,
+ nullptr,
net_log),
connect_job_delegate_(this),
pool_net_log_(net_log),
@@ -430,7 +430,7 @@ void WebSocketTransportClientSocketPool::FlushWithError(int error) {
++it) {
InvokeUserCallbackLater(
it->second->handle(), it->second->callback(), error);
- delete it->second, it->second = NULL;
+ delete it->second, it->second = nullptr;
}
pending_connects_.clear();
for (StalledRequestQueue::iterator it = stalled_request_queue_.begin();
@@ -551,7 +551,7 @@ void WebSocketTransportClientSocketPool::OnConnectJobComplete(
bool delete_succeeded = DeleteJob(handle);
DCHECK(delete_succeeded);
- job = NULL;
+ job = nullptr;
if (!handed_out_socket)
ActivateStalledRequest();
@@ -623,7 +623,7 @@ bool WebSocketTransportClientSocketPool::DeleteJob(ClientSocketHandle* handle) {
// (usually because of a failure) then it can trigger that job to be
// deleted. |it| remains valid because std::map guarantees that erase() does
// not invalid iterators to other entries.
- delete it->second, it->second = NULL;
+ delete it->second, it->second = nullptr;
DCHECK(pending_connects_.find(handle) == it);
pending_connects_.erase(it);
return true;
« no previous file with comments | « net/socket/websocket_endpoint_lock_manager.cc ('k') | net/socket/websocket_transport_client_socket_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698