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

Side by Side Diff: net/socket/ssl_client_socket_pool.h

Issue 1006643002: Plumb connection attempts from (non-proxy) ConnectJobs to HttpNetworkTransaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't copy attempts after reset on proxy HTTPS tunnel response Created 5 years, 9 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_SOCKET_SSL_CLIENT_SOCKET_POOL_H_ 5 #ifndef NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
6 #define NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_ 6 #define NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 162
163 const SSLClientSocketContext context_; 163 const SSLClientSocketContext context_;
164 164
165 State next_state_; 165 State next_state_;
166 CompletionCallback callback_; 166 CompletionCallback callback_;
167 scoped_ptr<ClientSocketHandle> transport_socket_handle_; 167 scoped_ptr<ClientSocketHandle> transport_socket_handle_;
168 scoped_ptr<SSLClientSocket> ssl_socket_; 168 scoped_ptr<SSLClientSocket> ssl_socket_;
169 169
170 HttpResponseInfo error_response_info_; 170 HttpResponseInfo error_response_info_;
171 171
172 ClientSocketHandle::ConnectionAttempts connection_attempts_;
173 IPEndPoint direct_address_;
174
172 DISALLOW_COPY_AND_ASSIGN(SSLConnectJob); 175 DISALLOW_COPY_AND_ASSIGN(SSLConnectJob);
173 }; 176 };
174 177
175 class NET_EXPORT_PRIVATE SSLClientSocketPool 178 class NET_EXPORT_PRIVATE SSLClientSocketPool
176 : public ClientSocketPool, 179 : public ClientSocketPool,
177 public HigherLayeredPool, 180 public HigherLayeredPool,
178 public SSLConfigService::Observer { 181 public SSLConfigService::Observer {
179 public: 182 public:
180 typedef SSLSocketParams SocketParams; 183 typedef SSLSocketParams SocketParams;
181 184
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 HttpProxyClientSocketPool* const http_proxy_pool_; 298 HttpProxyClientSocketPool* const http_proxy_pool_;
296 PoolBase base_; 299 PoolBase base_;
297 const scoped_refptr<SSLConfigService> ssl_config_service_; 300 const scoped_refptr<SSLConfigService> ssl_config_service_;
298 301
299 DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool); 302 DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool);
300 }; 303 };
301 304
302 } // namespace net 305 } // namespace net
303 306
304 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_ 307 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698