summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 01:14:52 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 01:14:52 +0000
commit6ecf2b9599dca0403a485cbf56bf6c9763681148 (patch)
treed8c108a197067ff7d9af24c19a52dfcc6ee4f926 /net/websockets
parentbbf8a1c1044f290dea937d6fb53170fbbba0f899 (diff)
downloadchromium_src-6ecf2b9599dca0403a485cbf56bf6c9763681148.zip
chromium_src-6ecf2b9599dca0403a485cbf56bf6c9763681148.tar.gz
chromium_src-6ecf2b9599dca0403a485cbf56bf6c9763681148.tar.bz2
base::Bind: Convert proxy_resolving_client_socket.[cc,h] and deps.
BUG=none TEST=none R=csilv Review URL: http://codereview.chromium.org/8898036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_job_unittest.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc
index 4f6bc97..2fd25d1 100644
--- a/net/websockets/websocket_job_unittest.cc
+++ b/net/websockets/websocket_job_unittest.cc
@@ -276,12 +276,11 @@ class MockHttpTransactionFactory : public net::HttpTransactionFactory {
false,
false);
net::ClientSocketHandle* connection = new net::ClientSocketHandle;
- EXPECT_EQ(net::OK, connection->Init(host_port_pair_.ToString(),
- transport_params_,
- net::MEDIUM,
- NULL,
- http_session_->GetTransportSocketPool(),
- net::BoundNetLog()));
+ EXPECT_EQ(net::OK,
+ connection->Init(host_port_pair_.ToString(), transport_params_,
+ net::MEDIUM, net::CompletionCallback(),
+ http_session_->GetTransportSocketPool(),
+ net::BoundNetLog()));
EXPECT_EQ(net::OK,
session_->InitializeWithSocket(connection, false, net::OK));
}