summaryrefslogtreecommitdiffstats
path: root/net/socket/tcp_client_socket_pool_unittest.cc
diff options
context:
space:
mode:
authorkristianm@google.com <kristianm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 10:28:06 +0000
committerkristianm@google.com <kristianm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 10:28:06 +0000
commita1915befb3a8aee0888776df027929616a8a3389 (patch)
tree29abe9bff21837279cdee93e3eb0f6bf5c34e128 /net/socket/tcp_client_socket_pool_unittest.cc
parent5cf520eb832cb1acc953d79602f60552a03082e9 (diff)
downloadchromium_src-a1915befb3a8aee0888776df027929616a8a3389.zip
chromium_src-a1915befb3a8aee0888776df027929616a8a3389.tar.gz
chromium_src-a1915befb3a8aee0888776df027929616a8a3389.tar.bz2
Revert 78061 - Revert 78034 - Removing a TODO and cleaning up code.
This is done in preparation of a patch to let some request ignore the max sockets and max sockets to group limits. BUG=none TEST=none Review URL: http://codereview.chromium.org/6679001 TBR=kristianm@google.com Review URL: http://codereview.chromium.org/6685057 TBR=kristianm@google.com Review URL: http://codereview.chromium.org/6696017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78189 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/tcp_client_socket_pool_unittest.cc')
-rw-r--r--net/socket/tcp_client_socket_pool_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket/tcp_client_socket_pool_unittest.cc b/net/socket/tcp_client_socket_pool_unittest.cc
index 307bd12..a8d496f 100644
--- a/net/socket/tcp_client_socket_pool_unittest.cc
+++ b/net/socket/tcp_client_socket_pool_unittest.cc
@@ -353,8 +353,9 @@ TEST_F(TCPClientSocketPoolTest, InitHostResolutionFailure) {
host_resolver_->rules()->AddSimulatedFailure("unresolvable.host.name");
TestCompletionCallback callback;
ClientSocketHandle handle;
+ HostPortPair host_port_pair("unresolvable.host.name", 80);
scoped_refptr<TCPSocketParams> dest(new TCPSocketParams(
- "unresolvable.host.name", 80, kDefaultPriority, GURL(), false));
+ host_port_pair, kDefaultPriority, GURL(), false));
EXPECT_EQ(ERR_IO_PENDING,
handle.Init("a", dest, kDefaultPriority, &callback, &pool_,
BoundNetLog()));