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

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

Issue 1580903002: Convert ignore_limits from a SocketParam to a socket request argument. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 11 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/macros.h" 10 #include "base/macros.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 }; 92 };
93 93
94 // SSLConnectJob handles the SSL handshake after setting up the underlying 94 // SSLConnectJob handles the SSL handshake after setting up the underlying
95 // connection as specified in the params. 95 // connection as specified in the params.
96 class SSLConnectJob : public ConnectJob { 96 class SSLConnectJob : public ConnectJob {
97 public: 97 public:
98 // Note: the SSLConnectJob does not own |messenger| so it must outlive the 98 // Note: the SSLConnectJob does not own |messenger| so it must outlive the
99 // job. 99 // job.
100 SSLConnectJob(const std::string& group_name, 100 SSLConnectJob(const std::string& group_name,
101 RequestPriority priority, 101 RequestPriority priority,
102 bool ignore_limits,
102 const scoped_refptr<SSLSocketParams>& params, 103 const scoped_refptr<SSLSocketParams>& params,
103 const base::TimeDelta& timeout_duration, 104 const base::TimeDelta& timeout_duration,
104 TransportClientSocketPool* transport_pool, 105 TransportClientSocketPool* transport_pool,
105 SOCKSClientSocketPool* socks_pool, 106 SOCKSClientSocketPool* socks_pool,
106 HttpProxyClientSocketPool* http_proxy_pool, 107 HttpProxyClientSocketPool* http_proxy_pool,
107 ClientSocketFactory* client_socket_factory, 108 ClientSocketFactory* client_socket_factory,
108 const SSLClientSocketContext& context, 109 const SSLClientSocketContext& context,
109 Delegate* delegate, 110 Delegate* delegate,
110 NetLog* net_log); 111 NetLog* net_log);
111 ~SSLConnectJob() override; 112 ~SSLConnectJob() override;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 HttpProxyClientSocketPool* http_proxy_pool, 199 HttpProxyClientSocketPool* http_proxy_pool,
199 SSLConfigService* ssl_config_service, 200 SSLConfigService* ssl_config_service,
200 NetLog* net_log); 201 NetLog* net_log);
201 202
202 ~SSLClientSocketPool() override; 203 ~SSLClientSocketPool() override;
203 204
204 // ClientSocketPool implementation. 205 // ClientSocketPool implementation.
205 int RequestSocket(const std::string& group_name, 206 int RequestSocket(const std::string& group_name,
206 const void* connect_params, 207 const void* connect_params,
207 RequestPriority priority, 208 RequestPriority priority,
209 bool ignore_limits,
208 ClientSocketHandle* handle, 210 ClientSocketHandle* handle,
209 const CompletionCallback& callback, 211 const CompletionCallback& callback,
210 const BoundNetLog& net_log) override; 212 const BoundNetLog& net_log) override;
211 213
212 void RequestSockets(const std::string& group_name, 214 void RequestSockets(const std::string& group_name,
213 const void* params, 215 const void* params,
214 int num_sockets, 216 int num_sockets,
215 const BoundNetLog& net_log) override; 217 const BoundNetLog& net_log) override;
216 218
217 void CancelRequest(const std::string& group_name, 219 void CancelRequest(const std::string& group_name,
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 HttpProxyClientSocketPool* const http_proxy_pool_; 297 HttpProxyClientSocketPool* const http_proxy_pool_;
296 PoolBase base_; 298 PoolBase base_;
297 const scoped_refptr<SSLConfigService> ssl_config_service_; 299 const scoped_refptr<SSLConfigService> ssl_config_service_;
298 300
299 DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool); 301 DISALLOW_COPY_AND_ASSIGN(SSLClientSocketPool);
300 }; 302 };
301 303
302 } // namespace net 304 } // namespace net
303 305
304 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_ 306 #endif // NET_SOCKET_SSL_CLIENT_SOCKET_POOL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698