diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 05:35:06 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-17 05:35:06 +0000 |
| commit | d510a78cd1aef9c2bdc692c79bae4a89f4851a98 (patch) | |
| tree | 1a81aa485c053d3e66ca3ba79f5563838e63ba85 /net/socket/socks_client_socket_pool.cc | |
| parent | a05725888f71e72e3335d265e47643fd2768e39f (diff) | |
| download | chromium_src-d510a78cd1aef9c2bdc692c79bae4a89f4851a98.zip chromium_src-d510a78cd1aef9c2bdc692c79bae4a89f4851a98.tar.gz chromium_src-d510a78cd1aef9c2bdc692c79bae4a89f4851a98.tar.bz2 | |
This is roughly a reland of r43908, although I had to rewrite a fair chunk since code's changed a lot. I've changed it so as not to flush the host resolver too. I suspect there might have been a bug there. I was unable to reproduce the crash here on network change, so I think either that fixed it or something else changed under the hood. In any case, I want to reland this and see if anyone encounters any problems with it.
BUG=40455,40457
Review URL: http://codereview.chromium.org/2114004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks_client_socket_pool.cc')
| -rw-r--r-- | net/socket/socks_client_socket_pool.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/socket/socks_client_socket_pool.cc b/net/socket/socks_client_socket_pool.cc index b98f9fd..febcdbf 100644 --- a/net/socket/socks_client_socket_pool.cc +++ b/net/socket/socks_client_socket_pool.cc @@ -161,13 +161,11 @@ SOCKSClientSocketPool::SOCKSClientSocketPool( int max_sockets_per_group, const std::string& name, const scoped_refptr<HostResolver>& host_resolver, - const scoped_refptr<TCPClientSocketPool>& tcp_pool, - NetworkChangeNotifier* network_change_notifier) + const scoped_refptr<TCPClientSocketPool>& tcp_pool) : base_(max_sockets, max_sockets_per_group, name, base::TimeDelta::FromSeconds(kUnusedIdleSocketTimeout), base::TimeDelta::FromSeconds(kUsedIdleSocketTimeout), - new SOCKSConnectJobFactory(tcp_pool, host_resolver), - network_change_notifier) {} + new SOCKSConnectJobFactory(tcp_pool, host_resolver)) {} SOCKSClientSocketPool::~SOCKSClientSocketPool() {} |