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

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

Issue 2906463002: Make HttpNetworkSession::host_mapping_rules no longer a pointer. (Closed)
Patch Set: More upstream merge conflicts! Fun! Created 3 years, 6 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 | « net/base/host_mapping_rules.cc ('k') | 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
11 #include <map> 11 #include <map>
12 #include <memory> 12 #include <memory>
13 #include <set> 13 #include <set>
14 #include <string> 14 #include <string>
15 #include <unordered_set> 15 #include <unordered_set>
16 #include <vector> 16 #include <vector>
17 17
18 #include "base/bind.h" 18 #include "base/bind.h"
19 #include "base/memory/memory_coordinator_client.h" 19 #include "base/memory/memory_coordinator_client.h"
20 #include "base/memory/memory_pressure_monitor.h" 20 #include "base/memory/memory_pressure_monitor.h"
21 #include "base/memory/ref_counted.h" 21 #include "base/memory/ref_counted.h"
22 #include "base/memory/weak_ptr.h" 22 #include "base/memory/weak_ptr.h"
23 #include "base/threading/non_thread_safe.h" 23 #include "base/threading/non_thread_safe.h"
24 #include "net/base/host_mapping_rules.h"
24 #include "net/base/host_port_pair.h" 25 #include "net/base/host_port_pair.h"
25 #include "net/base/net_export.h" 26 #include "net/base/net_export.h"
26 #include "net/dns/host_resolver.h" 27 #include "net/dns/host_resolver.h"
27 #include "net/http/http_auth_cache.h" 28 #include "net/http/http_auth_cache.h"
28 #include "net/http/http_stream_factory.h" 29 #include "net/http/http_stream_factory.h"
29 #include "net/quic/chromium/quic_stream_factory.h" 30 #include "net/quic/chromium/quic_stream_factory.h"
30 #include "net/socket/next_proto.h" 31 #include "net/socket/next_proto.h"
31 #include "net/spdy/chromium/spdy_session_pool.h" 32 #include "net/spdy/chromium/spdy_session_pool.h"
32 #include "net/spdy/core/spdy_protocol.h" 33 #include "net/spdy/core/spdy_protocol.h"
33 #include "net/ssl/ssl_client_auth_cache.h" 34 #include "net/ssl/ssl_client_auth_cache.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 bool enable_server_push_cancellation; 89 bool enable_server_push_cancellation;
89 ChannelIDService* channel_id_service; 90 ChannelIDService* channel_id_service;
90 TransportSecurityState* transport_security_state; 91 TransportSecurityState* transport_security_state;
91 CTVerifier* cert_transparency_verifier; 92 CTVerifier* cert_transparency_verifier;
92 CTPolicyEnforcer* ct_policy_enforcer; 93 CTPolicyEnforcer* ct_policy_enforcer;
93 ProxyService* proxy_service; 94 ProxyService* proxy_service;
94 SSLConfigService* ssl_config_service; 95 SSLConfigService* ssl_config_service;
95 HttpAuthHandlerFactory* http_auth_handler_factory; 96 HttpAuthHandlerFactory* http_auth_handler_factory;
96 HttpServerProperties* http_server_properties; 97 HttpServerProperties* http_server_properties;
97 NetLog* net_log; 98 NetLog* net_log;
98 HostMappingRules* host_mapping_rules; 99 HostMappingRules host_mapping_rules;
99 SocketPerformanceWatcherFactory* socket_performance_watcher_factory; 100 SocketPerformanceWatcherFactory* socket_performance_watcher_factory;
100 bool ignore_certificate_errors; 101 bool ignore_certificate_errors;
101 uint16_t testing_fixed_http_port; 102 uint16_t testing_fixed_http_port;
102 uint16_t testing_fixed_https_port; 103 uint16_t testing_fixed_https_port;
103 bool enable_tcp_fast_open_for_ssl; 104 bool enable_tcp_fast_open_for_ssl;
104 bool enable_user_alternate_protocol_ports; 105 bool enable_user_alternate_protocol_ports;
105 106
106 // Use SPDY ping frames to test for connection health after idle. 107 // Use SPDY ping frames to test for connection health after idle.
107 bool enable_spdy_ping_based_connection_checking; 108 bool enable_spdy_ping_based_connection_checking;
108 bool enable_http2; 109 bool enable_http2;
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
319 NextProtoVector next_protos_; 320 NextProtoVector next_protos_;
320 321
321 Params params_; 322 Params params_;
322 323
323 std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_; 324 std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
324 }; 325 };
325 326
326 } // namespace net 327 } // namespace net
327 328
328 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 329 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW
« no previous file with comments | « net/base/host_mapping_rules.cc ('k') | net/http/http_network_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698