Chromium Code Reviews| Index: net/socket/client_socket_handle.h |
| diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h |
| index c5b2720f7d3c454d9ebaa6453fc6536fff904772..2650d060fa52ab903e56785b14dd5eb1063aae1d 100644 |
| --- a/net/socket/client_socket_handle.h |
| +++ b/net/socket/client_socket_handle.h |
| @@ -50,6 +50,8 @@ class NET_EXPORT ClientSocketHandle { |
| // ClientSocketPool to obtain a connected socket, possibly reusing one. This |
| // method returns either OK or ERR_IO_PENDING. On ERR_IO_PENDING, |priority| |
| // is used to determine the placement in ClientSocketPool's wait list. |
| + // |ignore_limits| will bypass the wait list, if true, but |priority| must |
|
eroman
2016/01/27 20:15:12
Update comment (ignore_limits is no longer a boole
mmenke
2016/01/28 15:55:12
And just for the record, I've fixed this (And upda
|
| + // also be HIGHEST, if set. |
| // |
| // If this method succeeds, then the socket member will be set to an existing |
| // connected socket if an existing connected socket was available to reuse, |
| @@ -78,6 +80,7 @@ class NET_EXPORT ClientSocketHandle { |
| int Init(const std::string& group_name, |
| const scoped_refptr<typename PoolType::SocketParams>& socket_params, |
| RequestPriority priority, |
| + ClientSocketPool::IgnoreLimits ignore_limits, |
| const CompletionCallback& callback, |
| PoolType* pool, |
| const BoundNetLog& net_log); |
| @@ -236,6 +239,7 @@ int ClientSocketHandle::Init( |
| const std::string& group_name, |
| const scoped_refptr<typename PoolType::SocketParams>& socket_params, |
| RequestPriority priority, |
| + ClientSocketPool::IgnoreLimits ignore_limits, |
| const CompletionCallback& callback, |
| PoolType* pool, |
| const BoundNetLog& net_log) { |
| @@ -247,8 +251,8 @@ int ClientSocketHandle::Init( |
| pool_ = pool; |
| group_name_ = group_name; |
| init_time_ = base::TimeTicks::Now(); |
| - int rv = pool_->RequestSocket( |
| - group_name, &socket_params, priority, this, callback_, net_log); |
| + int rv = pool_->RequestSocket(group_name, &socket_params, priority, |
| + ignore_limits, this, callback_, net_log); |
| if (rv == ERR_IO_PENDING) { |
| user_callback_ = callback; |
| } else { |