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

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

Issue 2315213002: Temporary: Detect WebSocket destruction order problem (Closed)
Patch Set: s/October 2017/October 2016/ 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
« no previous file with comments | « no previous file | net/http/http_network_session.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
6 #define NET_HTTP_HTTP_NETWORK_SESSION_H_ 6 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 275
276 // Populates |*npn_protos| with protocols to be used with NPN. 276 // Populates |*npn_protos| with protocols to be used with NPN.
277 void GetNpnProtos(NextProtoVector* npn_protos) const; 277 void GetNpnProtos(NextProtoVector* npn_protos) const;
278 278
279 // Populates |server_config| and |proxy_config| based on this session and 279 // Populates |server_config| and |proxy_config| based on this session and
280 // |request|. 280 // |request|.
281 void GetSSLConfig(const HttpRequestInfo& request, 281 void GetSSLConfig(const HttpRequestInfo& request,
282 SSLConfig* server_config, 282 SSLConfig* server_config,
283 SSLConfig* proxy_config) const; 283 SSLConfig* proxy_config) const;
284 284
285 // TODO(ricea): Remove this by October 2016.
286 void IncrementActiveWebSockets() { ++active_websockets_; }
287 void DecrementActiveWebSockets() { --active_websockets_; }
288
285 private: 289 private:
286 friend class HttpNetworkSessionPeer; 290 friend class HttpNetworkSessionPeer;
287 291
288 ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type); 292 ClientSocketPoolManager* GetSocketPoolManager(SocketPoolType pool_type);
289 293
290 // Flush sockets on low memory notifications callback. 294 // Flush sockets on low memory notifications callback.
291 void OnMemoryPressure( 295 void OnMemoryPressure(
292 base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level); 296 base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level);
293 297
294 NetLog* const net_log_; 298 NetLog* const net_log_;
(...skipping 14 matching lines...) Expand all
309 std::unique_ptr<HttpStreamFactory> http_stream_factory_; 313 std::unique_ptr<HttpStreamFactory> http_stream_factory_;
310 std::unique_ptr<HttpStreamFactory> http_stream_factory_for_websocket_; 314 std::unique_ptr<HttpStreamFactory> http_stream_factory_for_websocket_;
311 std::set<HttpResponseBodyDrainer*> response_drainers_; 315 std::set<HttpResponseBodyDrainer*> response_drainers_;
312 316
313 NextProtoVector next_protos_; 317 NextProtoVector next_protos_;
314 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS]; 318 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS];
315 319
316 Params params_; 320 Params params_;
317 321
318 std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_; 322 std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
323
324 // TODO(ricea): Remove this by October 2016.
325 int active_websockets_ = 0;
319 }; 326 };
320 327
321 } // namespace net 328 } // namespace net
322 329
323 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 330 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_network_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698