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

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: Plumb up to HttpNetworkTransaction 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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 State next_state_; 254 State next_state_;
255 CompletionCallback io_callback_; 255 CompletionCallback io_callback_;
256 scoped_ptr<ClientSocketHandle> transport_socket_handle_; 256 scoped_ptr<ClientSocketHandle> transport_socket_handle_;
257 scoped_ptr<SSLClientSocket> ssl_socket_; 257 scoped_ptr<SSLClientSocket> ssl_socket_;
258 258
259 SSLConnectJobMessenger* messenger_; 259 SSLConnectJobMessenger* messenger_;
260 HttpResponseInfo error_response_info_; 260 HttpResponseInfo error_response_info_;
261 261
262 GetMessengerCallback get_messenger_callback_; 262 GetMessengerCallback get_messenger_callback_;
263 263
264 ClientSocketHandle::ConnectionAttempts connection_attempts_;
265 IPEndPoint direct_address_;
Ryan Hamilton 2015/03/17 03:22:28 Looks like this is the peer address. In that case,
Deprecated (see juliatuttle) 2015/03/23 17:45:35 It's specifically called direct_address_ because i
Ryan Hamilton 2015/03/24 19:20:19 Hm. I appreciate the distinction you're going for.
266
264 base::WeakPtrFactory<SSLConnectJob> weak_factory_; 267 base::WeakPtrFactory<SSLConnectJob> weak_factory_;
265 268
266 DISALLOW_COPY_AND_ASSIGN(SSLConnectJob); 269 DISALLOW_COPY_AND_ASSIGN(SSLConnectJob);
267 }; 270 };
268 271
269 class NET_EXPORT_PRIVATE SSLClientSocketPool 272 class NET_EXPORT_PRIVATE SSLClientSocketPool
270 : public ClientSocketPool, 273 : public ClientSocketPool,
271 public HigherLayeredPool, 274 public HigherLayeredPool,
272 public SSLConfigService::Observer { 275 public SSLConfigService::Observer {
273 public: 276 public:
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 const scoped_refptr<SSLConfigService> ssl_config_service_; 405 const scoped_refptr<SSLConfigService> ssl_config_service_;
403 MessengerMap messenger_map_; 406 MessengerMap messenger_map_;
404 bool enable_ssl_connect_job_waiting_; 407 bool enable_ssl_connect_job_waiting_;
405 408
406 DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool); 409 DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool);
407 }; 410 };
408 411
409 } // namespace net 412 } // namespace net
410 413
411 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_ 414 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698