From a796bcec176ca3875a55346800b3a60a83e2dd89 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Mon, 22 Mar 2010 17:17:26 +0000 Subject: Implement SOCKSClientSocketPool This is the first layered pool, so there are several infrastructure changes in this change as well. Add a ConnectionTimeout method to pools so that layered pools can timeout each phase. Add a name method to pools to support per pool UMA histograms. Change SOCKS sockets to take a ClientSocketHandle instead of a ClientSocket BUG=30357 (blocks an SSL Pool) TEST=existing unit tests Review URL: http://codereview.chromium.org/668097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42231 0039d316-1c4b-4281-b951-d872f2087c98 --- net/net.gyp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'net/net.gyp') diff --git a/net/net.gyp b/net/net.gyp index 7e22af8..1b66ab8 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -424,6 +424,8 @@ 'socket/socks5_client_socket.h', 'socket/socks_client_socket.cc', 'socket/socks_client_socket.h', + 'socket/socks_client_socket_pool.cc', + 'socket/socks_client_socket_pool.h', 'socket/ssl_client_socket.h', 'socket/ssl_client_socket_mac.cc', 'socket/ssl_client_socket_mac.h', @@ -681,6 +683,7 @@ 'proxy/single_threaded_proxy_resolver_unittest.cc', 'socket/client_socket_pool_base_unittest.cc', 'socket/socks5_client_socket_unittest.cc', + 'socket/socks_client_socket_pool_unittest.cc', 'socket/socks_client_socket_unittest.cc', 'socket/ssl_client_socket_unittest.cc', 'socket/tcp_client_socket_pool_unittest.cc', -- cgit v1.1