1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/net/socket/websocket_endpoint_lock_manager.cc b/chromium/net/socket/websocket_endpoint_lock_manager.cc
index 52cf5342a24..bd6a2210c26 100644
--- a/chromium/net/socket/websocket_endpoint_lock_manager.cc
+++ b/chromium/net/socket/websocket_endpoint_lock_manager.cc
@@ -12,7 +12,6 @@
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/net_errors.h"
-#include "net/log/net_log.h"
 
 namespace net {
 
@@ -79,7 +78,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 +102,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 +165,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