| Index: net/socket/socks_client_socket_pool_unittest.cc
|
| diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc
|
| index cef7ff6e36522e6490a72bc109075238ec39b047..4291f3c18ebf5f9303a3bed6119012ba18b0b4e5 100644
|
| --- a/net/socket/socks_client_socket_pool_unittest.cc
|
| +++ b/net/socket/socks_client_socket_pool_unittest.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/time.h"
|
| #include "net/base/mock_host_resolver.h"
|
| +#include "net/base/mock_network_change_notifier.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/base/test_completion_callback.h"
|
| #include "net/socket/client_socket_factory.h"
|
| @@ -83,9 +84,10 @@ class MockTCPClientSocketPool : public TCPClientSocketPool {
|
|
|
| MockTCPClientSocketPool(int max_sockets, int max_sockets_per_group,
|
| const std::string& name,
|
| - ClientSocketFactory* socket_factory)
|
| + ClientSocketFactory* socket_factory,
|
| + NetworkChangeNotifier* network_change_notifier)
|
| : TCPClientSocketPool(max_sockets, max_sockets_per_group, name,
|
| - NULL, NULL),
|
| + NULL, NULL, network_change_notifier),
|
| client_socket_factory_(socket_factory),
|
| release_count_(0),
|
| cancel_count_(0) {}
|
| @@ -169,12 +171,11 @@ class SOCKSClientSocketPoolTest : public ClientSocketPoolTest {
|
| : ignored_tcp_socket_params_("proxy", 80, MEDIUM, GURL(), false),
|
| tcp_socket_pool_(new MockTCPClientSocketPool(
|
| kMaxSockets, kMaxSocketsPerGroup, "MockTCP",
|
| - &tcp_client_socket_factory_)),
|
| + &tcp_client_socket_factory_, &tcp_notifier_)),
|
| ignored_socket_params_(ignored_tcp_socket_params_, true, "host", 80,
|
| MEDIUM, GURL()),
|
| - pool_(new SOCKSClientSocketPool(
|
| - kMaxSockets, kMaxSocketsPerGroup,
|
| - "SOCKSUnitTest", NULL, tcp_socket_pool_.get())) {
|
| + pool_(new SOCKSClientSocketPool(kMaxSockets, kMaxSocketsPerGroup,
|
| + "SOCKSUnitTest", NULL, tcp_socket_pool_.get(), &socks_notifier_)) {
|
| }
|
|
|
| int StartRequest(const std::string& group_name, RequestPriority priority) {
|
| @@ -184,9 +185,11 @@ class SOCKSClientSocketPoolTest : public ClientSocketPoolTest {
|
|
|
| TCPSocketParams ignored_tcp_socket_params_;
|
| MockClientSocketFactory tcp_client_socket_factory_;
|
| + MockNetworkChangeNotifier tcp_notifier_;
|
| scoped_refptr<MockTCPClientSocketPool> tcp_socket_pool_;
|
|
|
| SOCKSSocketParams ignored_socket_params_;
|
| + MockNetworkChangeNotifier socks_notifier_;
|
| scoped_refptr<SOCKSClientSocketPool> pool_;
|
| };
|
|
|
|
|