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

Side by Side Diff: net/http/http_network_session.cc

Issue 2315213002: Temporary: Detect WebSocket destruction order problem (Closed)
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/http/http_network_session.h" 5 #include "net/http/http_network_session.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/atomic_sequence_num.h" 9 #include "base/atomic_sequence_num.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 http_server_properties_->SetMaxServerConfigsStoredInProperties( 249 http_server_properties_->SetMaxServerConfigsStoredInProperties(
250 params.quic_max_server_configs_stored_in_properties); 250 params.quic_max_server_configs_stored_in_properties);
251 251
252 memory_pressure_listener_.reset(new base::MemoryPressureListener(base::Bind( 252 memory_pressure_listener_.reset(new base::MemoryPressureListener(base::Bind(
253 &HttpNetworkSession::OnMemoryPressure, base::Unretained(this)))); 253 &HttpNetworkSession::OnMemoryPressure, base::Unretained(this))));
254 } 254 }
255 255
256 HttpNetworkSession::~HttpNetworkSession() { 256 HttpNetworkSession::~HttpNetworkSession() {
257 base::STLDeleteElements(&response_drainers_); 257 base::STLDeleteElements(&response_drainers_);
258 spdy_session_pool_.CloseAllSessions(); 258 spdy_session_pool_.CloseAllSessions();
259
260 // TODO(ricea): Remove this by October 2017. See bug 641013.
261 CHECK_EQ(active_websockets_, 0);
259 } 262 }
260 263
261 void HttpNetworkSession::AddResponseDrainer(HttpResponseBodyDrainer* drainer) { 264 void HttpNetworkSession::AddResponseDrainer(HttpResponseBodyDrainer* drainer) {
262 DCHECK(!base::ContainsKey(response_drainers_, drainer)); 265 DCHECK(!base::ContainsKey(response_drainers_, drainer));
263 response_drainers_.insert(drainer); 266 response_drainers_.insert(drainer);
264 } 267 }
265 268
266 void HttpNetworkSession::RemoveResponseDrainer( 269 void HttpNetworkSession::RemoveResponseDrainer(
267 HttpResponseBodyDrainer* drainer) { 270 HttpResponseBodyDrainer* drainer) {
268 DCHECK(base::ContainsKey(response_drainers_, drainer)); 271 DCHECK(base::ContainsKey(response_drainers_, drainer));
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE: 425 case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_NONE:
423 break; 426 break;
424 case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE: 427 case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE:
425 case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL: 428 case base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL:
426 CloseIdleConnections(); 429 CloseIdleConnections();
427 break; 430 break;
428 } 431 }
429 } 432 }
430 433
431 } // namespace net 434 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698