diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 23:55:02 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-08 23:55:02 +0000 |
| commit | d2b5f09e54322cdd0c1046b6661324672a948394 (patch) | |
| tree | 5d2012e2c6aa74847504caabff6a6dfb00d1aaaa /net/websockets | |
| parent | cc7823bc07a6f6a05e30a4670041c5b28f40c4aa (diff) | |
| download | chromium_src-d2b5f09e54322cdd0c1046b6661324672a948394.zip chromium_src-d2b5f09e54322cdd0c1046b6661324672a948394.tar.gz chromium_src-d2b5f09e54322cdd0c1046b6661324672a948394.tar.bz2 | |
Add a new OnHostResolutionCallback to TransportSocketParams
Correctly implement OnHostResolution in HttpStreamFactoryImpl::Job
BUG=106235
TEST=HttpNetworkTransactionSpdy\*Test.UseIPConnectionPoolingAfterResolution
Review URL: https://chromiumcodereview.appspot.com/10238010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
| -rw-r--r-- | net/websockets/websocket_job_spdy2_unittest.cc | 10 | ||||
| -rw-r--r-- | net/websockets/websocket_job_spdy3_unittest.cc | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/net/websockets/websocket_job_spdy2_unittest.cc b/net/websockets/websocket_job_spdy2_unittest.cc index 0aea40f..a7da880 100644 --- a/net/websockets/websocket_job_spdy2_unittest.cc +++ b/net/websockets/websocket_job_spdy2_unittest.cc @@ -286,10 +286,12 @@ class MockHttpTransactionFactory : public net::HttpTransactionFactory { spdy_session_pool->Get(host_port_proxy_pair_, net::BoundNetLog()); EXPECT_TRUE(spdy_session_pool->HasSession(host_port_proxy_pair_)); - transport_params_ = new net::TransportSocketParams(host_port_pair_, - net::MEDIUM, - false, - false); + transport_params_ = + new net::TransportSocketParams(host_port_pair_, + net::MEDIUM, + false, + false, + net::OnHostResolutionCallback()); net::ClientSocketHandle* connection = new net::ClientSocketHandle; EXPECT_EQ(net::OK, connection->Init(host_port_pair_.ToString(), transport_params_, diff --git a/net/websockets/websocket_job_spdy3_unittest.cc b/net/websockets/websocket_job_spdy3_unittest.cc index c40ac79..8e28ae5 100644 --- a/net/websockets/websocket_job_spdy3_unittest.cc +++ b/net/websockets/websocket_job_spdy3_unittest.cc @@ -290,10 +290,12 @@ class MockHttpTransactionFactory : public net::HttpTransactionFactory { spdy_session_pool->Get(host_port_proxy_pair_, net::BoundNetLog()); EXPECT_TRUE(spdy_session_pool->HasSession(host_port_proxy_pair_)); - transport_params_ = new net::TransportSocketParams(host_port_pair_, - net::MEDIUM, - false, - false); + transport_params_ = + new net::TransportSocketParams(host_port_pair_, + net::MEDIUM, + false, + false, + net::OnHostResolutionCallback()); net::ClientSocketHandle* connection = new net::ClientSocketHandle; EXPECT_EQ(net::OK, connection->Init(host_port_pair_.ToString(), transport_params_, |