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

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

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved tests back to ssl_client_socket_unittest.cc, fixed various other issues. Created 6 years, 4 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 #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 <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 TransportSecurityState* transport_security_state; 69 TransportSecurityState* transport_security_state;
70 CTVerifier* cert_transparency_verifier; 70 CTVerifier* cert_transparency_verifier;
71 ProxyService* proxy_service; 71 ProxyService* proxy_service;
72 std::string ssl_session_cache_shard; 72 std::string ssl_session_cache_shard;
73 SSLConfigService* ssl_config_service; 73 SSLConfigService* ssl_config_service;
74 HttpAuthHandlerFactory* http_auth_handler_factory; 74 HttpAuthHandlerFactory* http_auth_handler_factory;
75 NetworkDelegate* network_delegate; 75 NetworkDelegate* network_delegate;
76 base::WeakPtr<HttpServerProperties> http_server_properties; 76 base::WeakPtr<HttpServerProperties> http_server_properties;
77 NetLog* net_log; 77 NetLog* net_log;
78 HostMappingRules* host_mapping_rules; 78 HostMappingRules* host_mapping_rules;
79 bool enable_ssl_connect_job_waiting;
79 bool ignore_certificate_errors; 80 bool ignore_certificate_errors;
80 uint16 testing_fixed_http_port; 81 uint16 testing_fixed_http_port;
81 uint16 testing_fixed_https_port; 82 uint16 testing_fixed_https_port;
82 83
83 bool force_spdy_single_domain; 84 bool force_spdy_single_domain;
84 bool enable_spdy_compression; 85 bool enable_spdy_compression;
85 bool enable_spdy_ping_based_connection_checking; 86 bool enable_spdy_ping_based_connection_checking;
86 NextProto spdy_default_protocol; 87 NextProto spdy_default_protocol;
87 // The protocols supported by NPN (next protocol negotiation) during the 88 // The protocols supported by NPN (next protocol negotiation) during the
88 // SSL handshake as well as by HTTP Alternate-Protocol. 89 // SSL handshake as well as by HTTP Alternate-Protocol.
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 239
239 std::vector<std::string> next_protos_; 240 std::vector<std::string> next_protos_;
240 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS]; 241 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS];
241 242
242 Params params_; 243 Params params_;
243 }; 244 };
244 245
245 } // namespace net 246 } // namespace net
246 247
247 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 248 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698