| Index: net/socket/socket_test_util.cc
|
| diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc
|
| index 04f5151d4fe7f0293ff62908e1036dc5057d437d..97e364213a35a627dd7980c9b6f0e26895d11201 100644
|
| --- a/net/socket/socket_test_util.cc
|
| +++ b/net/socket/socket_test_util.cc
|
| @@ -1595,9 +1595,13 @@ MockTransportClientSocketPool::MockTransportClientSocketPool(
|
| MockTransportClientSocketPool::~MockTransportClientSocketPool() {}
|
|
|
| int MockTransportClientSocketPool::RequestSocket(
|
| - const std::string& group_name, const void* socket_params,
|
| - RequestPriority priority, ClientSocketHandle* handle,
|
| - const CompletionCallback& callback, const BoundNetLog& net_log) {
|
| + const std::string& group_name,
|
| + const void* socket_params,
|
| + RequestPriority priority,
|
| + RespectLimits respect_limits,
|
| + ClientSocketHandle* handle,
|
| + const CompletionCallback& callback,
|
| + const BoundNetLog& net_log) {
|
| last_request_priority_ = priority;
|
| scoped_ptr<StreamSocket> socket =
|
| client_socket_factory_->CreateTransportClientSocket(
|
| @@ -1640,12 +1644,16 @@ MockSOCKSClientSocketPool::MockSOCKSClientSocketPool(
|
|
|
| MockSOCKSClientSocketPool::~MockSOCKSClientSocketPool() {}
|
|
|
| -int MockSOCKSClientSocketPool::RequestSocket(
|
| - const std::string& group_name, const void* socket_params,
|
| - RequestPriority priority, ClientSocketHandle* handle,
|
| - const CompletionCallback& callback, const BoundNetLog& net_log) {
|
| - return transport_pool_->RequestSocket(
|
| - group_name, socket_params, priority, handle, callback, net_log);
|
| +int MockSOCKSClientSocketPool::RequestSocket(const std::string& group_name,
|
| + const void* socket_params,
|
| + RequestPriority priority,
|
| + RespectLimits respect_limits,
|
| + ClientSocketHandle* handle,
|
| + const CompletionCallback& callback,
|
| + const BoundNetLog& net_log) {
|
| + return transport_pool_->RequestSocket(group_name, socket_params, priority,
|
| + respect_limits, handle, callback,
|
| + net_log);
|
| }
|
|
|
| void MockSOCKSClientSocketPool::CancelRequest(
|
|
|