summaryrefslogtreecommitdiff
path: root/chromium/net/socket/websocket_transport_client_socket_pool.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-12-10 16:19:40 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-12-10 16:01:50 +0000
commit51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch)
tree835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/net/socket/websocket_transport_client_socket_pool.cc
parent6036726eb981b6c4b42047513b9d3f4ac865daac (diff)
downloadqtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/net/socket/websocket_transport_client_socket_pool.cc')
-rw-r--r--chromium/net/socket/websocket_transport_client_socket_pool.cc16
1 files changed, 7 insertions, 9 deletions
diff --git a/chromium/net/socket/websocket_transport_client_socket_pool.cc b/chromium/net/socket/websocket_transport_client_socket_pool.cc
index cdf411afc8b..ea80b8e12fa 100644
--- a/chromium/net/socket/websocket_transport_client_socket_pool.cc
+++ b/chromium/net/socket/websocket_transport_client_socket_pool.cc
@@ -353,7 +353,7 @@ int WebSocketTransportClientSocketPool::RequestSocket(
request_net_log.AddEvent(NetLogEventType::SOCKET_POOL_STALLED_MAX_SOCKETS);
stalled_request_queue_.emplace_back(casted_params, priority, handle,
std::move(callback), request_net_log);
- StalledRequestQueue::iterator iterator = stalled_request_queue_.end();
+ auto iterator = stalled_request_queue_.end();
--iterator;
DCHECK_EQ(handle, iterator->handle);
// Because StalledRequestQueue is a std::list, its iterators are guaranteed
@@ -449,15 +449,13 @@ void WebSocketTransportClientSocketPool::FlushWithError(int error) {
// calls because this method will delete the jobs and call their callbacks
// anyway.
flushing_ = true;
- for (PendingConnectsMap::iterator it = pending_connects_.begin();
- it != pending_connects_.end();) {
+ for (auto it = pending_connects_.begin(); it != pending_connects_.end();) {
InvokeUserCallbackLater(it->second->handle(),
it->second->release_callback(), error);
it = pending_connects_.erase(it);
}
- for (StalledRequestQueue::iterator it = stalled_request_queue_.begin();
- it != stalled_request_queue_.end();
- ++it) {
+ for (auto it = stalled_request_queue_.begin();
+ it != stalled_request_queue_.end(); ++it) {
InvokeUserCallbackLater(it->handle, std::move(it->callback), error);
}
stalled_request_map_.clear();
@@ -644,7 +642,7 @@ void WebSocketTransportClientSocketPool::AddJob(
}
bool WebSocketTransportClientSocketPool::DeleteJob(ClientSocketHandle* handle) {
- PendingConnectsMap::iterator it = pending_connects_.find(handle);
+ auto it = pending_connects_.find(handle);
if (it == pending_connects_.end())
return false;
// Deleting a ConnectJob which holds an endpoint lock can lead to a different
@@ -658,7 +656,7 @@ bool WebSocketTransportClientSocketPool::DeleteJob(ClientSocketHandle* handle) {
const WebSocketTransportConnectJob*
WebSocketTransportClientSocketPool::LookupConnectJob(
const ClientSocketHandle* handle) const {
- PendingConnectsMap::const_iterator it = pending_connects_.find(handle);
+ auto it = pending_connects_.find(handle);
CHECK(it != pending_connects_.end());
return it->second.get();
}
@@ -694,7 +692,7 @@ void WebSocketTransportClientSocketPool::ActivateStalledRequest() {
bool WebSocketTransportClientSocketPool::DeleteStalledRequest(
ClientSocketHandle* handle) {
- StalledRequestMap::iterator it = stalled_request_map_.find(handle);
+ auto it = stalled_request_map_.find(handle);
if (it == stalled_request_map_.end())
return false;
stalled_request_queue_.erase(it->second);