Index: net/socket/client_socket_pool_base.h |
diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h |
index cd13ce0dbdd41ab0398d2600d34c4cbc488e6528..d32359b2d4e85698e284f31616d5020673fd55ec 100644 |
--- a/net/socket/client_socket_pool_base.h |
+++ b/net/socket/client_socket_pool_base.h |
@@ -81,6 +81,7 @@ class NET_EXPORT_PRIVATE ConnectJob { |
ConnectJob(const std::string& group_name, |
base::TimeDelta timeout_duration, |
RequestPriority priority, |
+ bool ignore_limits, |
Delegate* delegate, |
const BoundNetLog& net_log); |
virtual ~ConnectJob(); |
@@ -117,6 +118,7 @@ class NET_EXPORT_PRIVATE ConnectJob { |
protected: |
RequestPriority priority() const { return priority_; } |
+ bool ignore_limits() const { return ignore_limits_; } |
void SetSocket(scoped_ptr<StreamSocket> socket); |
StreamSocket* socket() { return socket_.get(); } |
void NotifyDelegateOfCompletion(int rv); |
@@ -138,6 +140,7 @@ class NET_EXPORT_PRIVATE ConnectJob { |
const base::TimeDelta timeout_duration_; |
// TODO(akalin): Support reprioritization. |
const RequestPriority priority_; |
+ const bool ignore_limits_; |
// Timer to abort jobs that take too long. |
base::OneShotTimer timer_; |
Delegate* delegate_; |
@@ -680,12 +683,16 @@ class ClientSocketPoolBase { |
Request(ClientSocketHandle* handle, |
const CompletionCallback& callback, |
RequestPriority priority, |
- internal::ClientSocketPoolBaseHelper::Flags flags, |
bool ignore_limits, |
+ internal::ClientSocketPoolBaseHelper::Flags flags, |
const scoped_refptr<SocketParams>& params, |
const BoundNetLog& net_log) |
- : internal::ClientSocketPoolBaseHelper::Request( |
- handle, callback, priority, ignore_limits, flags, net_log), |
+ : internal::ClientSocketPoolBaseHelper::Request(handle, |
+ callback, |
+ priority, |
+ ignore_limits, |
+ flags, |
+ net_log), |
params_(params) {} |
const scoped_refptr<SocketParams>& params() const { return params_; } |
@@ -749,14 +756,13 @@ class ClientSocketPoolBase { |
int RequestSocket(const std::string& group_name, |
const scoped_refptr<SocketParams>& params, |
RequestPriority priority, |
+ bool ignore_limits, |
ClientSocketHandle* handle, |
const CompletionCallback& callback, |
const BoundNetLog& net_log) { |
- scoped_ptr<const Request> request( |
- new Request(handle, callback, priority, |
- internal::ClientSocketPoolBaseHelper::NORMAL, |
- params->ignore_limits(), |
- params, net_log)); |
+ scoped_ptr<const Request> request(new Request( |
+ handle, callback, priority, ignore_limits, |
+ internal::ClientSocketPoolBaseHelper::NORMAL, params, net_log)); |
return helper_.RequestSocket(group_name, std::move(request)); |
} |
@@ -768,8 +774,9 @@ class ClientSocketPoolBase { |
int num_sockets, |
const BoundNetLog& net_log) { |
const Request request(NULL /* no handle */, CompletionCallback(), IDLE, |
+ false /* ignore_limits */, |
internal::ClientSocketPoolBaseHelper::NO_IDLE_SOCKETS, |
- params->ignore_limits(), params, net_log); |
+ params, net_log); |
helper_.RequestSockets(group_name, request, num_sockets); |
} |