net/http/http_network_session.h - Issue 3112034: Attempting to re-land CL 3110006 which turned out to have ...

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

Issue 3112034: Attempting to re-land CL 3110006 which turned out to have ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 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 | Annotate | Revision Log

« no previous file with comments | « no previous file | net/http/http_network_session.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 #pragma once	7 #pragma once

8	8

9 #include <map>	9 #include <map>

10 #include "base/non_thread_safe.h"	10 #include "base/non_thread_safe.h"

(...skipping 138 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
149 friend class HttpNetworkSessionPeer;	149 friend class HttpNetworkSessionPeer;

150	150

151 ~HttpNetworkSession();	151 ~HttpNetworkSession();

152	152

153 HttpAuthCache auth_cache_;	153 HttpAuthCache auth_cache_;

154 SSLClientAuthCache ssl_client_auth_cache_;	154 SSLClientAuthCache ssl_client_auth_cache_;

155 HttpAlternateProtocols alternate_protocols_;	155 HttpAlternateProtocols alternate_protocols_;

156 scoped_refptr<ClientSocketPoolHistograms> tcp_pool_histograms_;	156 scoped_refptr<ClientSocketPoolHistograms> tcp_pool_histograms_;

157 scoped_refptr<ClientSocketPoolHistograms> tcp_for_http_proxy_pool_histograms_;	157 scoped_refptr<ClientSocketPoolHistograms> tcp_for_http_proxy_pool_histograms_;

158 scoped_refptr<ClientSocketPoolHistograms> http_proxy_pool_histograms_;	158 scoped_refptr<ClientSocketPoolHistograms> http_proxy_pool_histograms_;

	159 scoped_refptr<ClientSocketPoolHistograms>

	160 tcp_for_https_proxy_pool_histograms_;

	161 scoped_refptr<ClientSocketPoolHistograms>

	162 ssl_for_https_proxy_pool_histograms_;

159 scoped_refptr<ClientSocketPoolHistograms> tcp_for_socks_pool_histograms_;	163 scoped_refptr<ClientSocketPoolHistograms> tcp_for_socks_pool_histograms_;

160 scoped_refptr<ClientSocketPoolHistograms> socks_pool_histograms_;	164 scoped_refptr<ClientSocketPoolHistograms> socks_pool_histograms_;

161 scoped_refptr<ClientSocketPoolHistograms> ssl_pool_histograms_;	165 scoped_refptr<ClientSocketPoolHistograms> ssl_pool_histograms_;

162 scoped_refptr<TCPClientSocketPool> tcp_socket_pool_;	166 scoped_refptr<TCPClientSocketPool> tcp_socket_pool_;

163 scoped_refptr<SSLClientSocketPool> ssl_socket_pool_;	167 scoped_refptr<SSLClientSocketPool> ssl_socket_pool_;

164 HTTPProxySocketPoolMap http_proxy_socket_pools_;	168 HTTPProxySocketPoolMap http_proxy_socket_pools_;

165 SOCKSSocketPoolMap socks_socket_pools_;	169 SOCKSSocketPoolMap socks_socket_pools_;

166 SSLSocketPoolMap ssl_socket_pools_for_proxies_;	170 SSLSocketPoolMap ssl_socket_pools_for_proxies_;

167 ClientSocketFactory* socket_factory_;	171 ClientSocketFactory* socket_factory_;

168 scoped_refptr<HostResolver> host_resolver_;	172 scoped_refptr<HostResolver> host_resolver_;

169 scoped_refptr<ProxyService> proxy_service_;	173 scoped_refptr<ProxyService> proxy_service_;

170 scoped_refptr<SSLConfigService> ssl_config_service_;	174 scoped_refptr<SSLConfigService> ssl_config_service_;

171 scoped_refptr<SpdySessionPool> spdy_session_pool_;	175 scoped_refptr<SpdySessionPool> spdy_session_pool_;

172 scoped_refptr<HttpStreamFactory> http_stream_factory_;	176 scoped_refptr<HttpStreamFactory> http_stream_factory_;

173 HttpAuthHandlerFactory* http_auth_handler_factory_;	177 HttpAuthHandlerFactory* http_auth_handler_factory_;

174 HttpNetworkDelegate* const network_delegate_;	178 HttpNetworkDelegate* const network_delegate_;

175 NetLog* net_log_;	179 NetLog* net_log_;

176 SpdySettingsStorage spdy_settings_;	180 SpdySettingsStorage spdy_settings_;

177 };	181 };

178	182

179 } // namespace net	183 } // namespace net

180	184

181 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_	185 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_

OLD	NEW