Index: net/socket/websocket_endpoint_lock_manager.cc |
diff --git a/net/socket/websocket_endpoint_lock_manager.cc b/net/socket/websocket_endpoint_lock_manager.cc |
index 52cf5342a242706c78281092ede14f89f5223ed6..985819997d4c0e87e9127c6eb87d668fafa71d04 100644 |
--- a/net/socket/websocket_endpoint_lock_manager.cc |
+++ b/net/socket/websocket_endpoint_lock_manager.cc |
@@ -79,7 +79,7 @@ void WebSocketEndpointLockManager::UnlockSocket(StreamSocket* socket) { |
<< socket_lock_info_map_.size() << " socket(s) left)"; |
socket_lock_info_map_.erase(socket_it); |
DCHECK_EQ(socket, lock_info_it->second.socket); |
- lock_info_it->second.socket = NULL; |
+ lock_info_it->second.socket = nullptr; |
UnlockEndpointAfterDelay(lock_info_it->first); |
} |
@@ -103,7 +103,7 @@ base::TimeDelta WebSocketEndpointLockManager::SetUnlockDelayForTesting( |
return old_delay; |
} |
-WebSocketEndpointLockManager::LockInfo::LockInfo() : socket(NULL) {} |
+WebSocketEndpointLockManager::LockInfo::LockInfo() : socket(nullptr) {} |
WebSocketEndpointLockManager::LockInfo::~LockInfo() { |
DCHECK(!socket); |
} |
@@ -166,7 +166,7 @@ void WebSocketEndpointLockManager::EraseSocket( |
<< socket_lock_info_map_.size() << " socket(s) left)"; |
size_t erased = socket_lock_info_map_.erase(lock_info_it->second.socket); |
DCHECK_EQ(1U, erased); |
- lock_info_it->second.socket = NULL; |
+ lock_info_it->second.socket = nullptr; |
} |
} // namespace net |