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

Side by Side Diff: net/http/http_proxy_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_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 5 #ifndef NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
6 #define NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 6 #define NET_HTTP_HTTP_PROXY_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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 const HostPortPair& endpoint() const { return endpoint_; } 63 const HostPortPair& endpoint() const { return endpoint_; }
64 HttpAuthCache* http_auth_cache() const { return http_auth_cache_; } 64 HttpAuthCache* http_auth_cache() const { return http_auth_cache_; }
65 HttpAuthHandlerFactory* http_auth_handler_factory() const { 65 HttpAuthHandlerFactory* http_auth_handler_factory() const {
66 return http_auth_handler_factory_; 66 return http_auth_handler_factory_;
67 } 67 }
68 SpdySessionPool* spdy_session_pool() { 68 SpdySessionPool* spdy_session_pool() {
69 return spdy_session_pool_; 69 return spdy_session_pool_;
70 } 70 }
71 const HostResolver::RequestInfo& destination() const; 71 const HostResolver::RequestInfo& destination() const;
72 bool tunnel() const { return tunnel_; } 72 bool tunnel() const { return tunnel_; }
73 bool ignore_limits() const { return ignore_limits_; } 73 bool ignore_limits() const { return ignore_limits_; }
eroman 2016/01/26 23:04:57 Delete this
mmenke 2016/01/27 18:16:25 Done.
74 74
75 ProxyDelegate* proxy_delegate() const { 75 ProxyDelegate* proxy_delegate() const {
76 return proxy_delegate_; 76 return proxy_delegate_;
77 } 77 }
78 78
79 private: 79 private:
80 friend class base::RefCounted<HttpProxySocketParams>; 80 friend class base::RefCounted<HttpProxySocketParams>;
81 ~HttpProxySocketParams(); 81 ~HttpProxySocketParams();
82 82
83 const scoped_refptr<TransportSocketParams> transport_params_; 83 const scoped_refptr<TransportSocketParams> transport_params_;
84 const scoped_refptr<SSLSocketParams> ssl_params_; 84 const scoped_refptr<SSLSocketParams> ssl_params_;
85 SpdySessionPool* spdy_session_pool_; 85 SpdySessionPool* spdy_session_pool_;
86 const std::string user_agent_; 86 const std::string user_agent_;
87 const HostPortPair endpoint_; 87 const HostPortPair endpoint_;
88 HttpAuthCache* const http_auth_cache_; 88 HttpAuthCache* const http_auth_cache_;
89 HttpAuthHandlerFactory* const http_auth_handler_factory_; 89 HttpAuthHandlerFactory* const http_auth_handler_factory_;
90 const bool tunnel_; 90 const bool tunnel_;
91 bool ignore_limits_; 91 bool ignore_limits_;
eroman 2016/01/26 23:04:57 Delete this
mmenke 2016/01/27 18:16:25 Done. And caught a couple more I missed - the enu
92 ProxyDelegate* proxy_delegate_; 92 ProxyDelegate* proxy_delegate_;
93 93
94 DISALLOW_COPY_AND_ASSIGN(HttpProxySocketParams); 94 DISALLOW_COPY_AND_ASSIGN(HttpProxySocketParams);
95 }; 95 };
96 96
97 // HttpProxyConnectJob optionally establishes a tunnel through the proxy 97 // HttpProxyConnectJob optionally establishes a tunnel through the proxy
98 // server after connecting the underlying transport socket. 98 // server after connecting the underlying transport socket.
99 class HttpProxyConnectJob : public ConnectJob { 99 class HttpProxyConnectJob : public ConnectJob {
100 public: 100 public:
101 HttpProxyConnectJob(const std::string& group_name, 101 HttpProxyConnectJob(const std::string& group_name,
102 RequestPriority priority, 102 RequestPriority priority,
103 bool ignore_limits,
103 const scoped_refptr<HttpProxySocketParams>& params, 104 const scoped_refptr<HttpProxySocketParams>& params,
104 const base::TimeDelta& timeout_duration, 105 const base::TimeDelta& timeout_duration,
105 TransportClientSocketPool* transport_pool, 106 TransportClientSocketPool* transport_pool,
106 SSLClientSocketPool* ssl_pool, 107 SSLClientSocketPool* ssl_pool,
107 Delegate* delegate, 108 Delegate* delegate,
108 NetLog* net_log); 109 NetLog* net_log);
109 ~HttpProxyConnectJob() override; 110 ~HttpProxyConnectJob() override;
110 111
111 // ConnectJob methods. 112 // ConnectJob methods.
112 LoadState GetLoadState() const override; 113 LoadState GetLoadState() const override;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 TransportClientSocketPool* transport_pool, 146 TransportClientSocketPool* transport_pool,
146 SSLClientSocketPool* ssl_pool, 147 SSLClientSocketPool* ssl_pool,
147 NetLog* net_log); 148 NetLog* net_log);
148 149
149 ~HttpProxyClientSocketPool() override; 150 ~HttpProxyClientSocketPool() override;
150 151
151 // ClientSocketPool implementation. 152 // ClientSocketPool implementation.
152 int RequestSocket(const std::string& group_name, 153 int RequestSocket(const std::string& group_name,
153 const void* connect_params, 154 const void* connect_params,
154 RequestPriority priority, 155 RequestPriority priority,
156 bool ignore_limits,
155 ClientSocketHandle* handle, 157 ClientSocketHandle* handle,
156 const CompletionCallback& callback, 158 const CompletionCallback& callback,
157 const BoundNetLog& net_log) override; 159 const BoundNetLog& net_log) override;
158 160
159 void RequestSockets(const std::string& group_name, 161 void RequestSockets(const std::string& group_name,
160 const void* params, 162 const void* params,
161 int num_sockets, 163 int num_sockets,
162 const BoundNetLog& net_log) override; 164 const BoundNetLog& net_log) override;
163 165
164 void CancelRequest(const std::string& group_name, 166 void CancelRequest(const std::string& group_name,
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 TransportClientSocketPool* const transport_pool_; 227 TransportClientSocketPool* const transport_pool_;
226 SSLClientSocketPool* const ssl_pool_; 228 SSLClientSocketPool* const ssl_pool_;
227 PoolBase base_; 229 PoolBase base_;
228 230
229 DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocketPool); 231 DISALLOW_COPY_AND_ASSIGN(HttpProxyClientSocketPool);
230 }; 232 };
231 233
232 } // namespace net 234 } // namespace net
233 235
234 #endif // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_ 236 #endif // NET_HTTP_HTTP_PROXY_CLIENT_SOCKET_POOL_H_
OLDNEW
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_proxy_client_socket_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698