diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 13:33:21 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-19 13:33:21 +0000 |
commit | 7ab5bbd128a32d32046201df76b86d370efa65af (patch) | |
tree | 69a234c16498a3a27acacc2c4681f783c4bd0975 /net/socket/ssl_client_socket_unittest.cc | |
parent | 0a0d806aa4c534ff999f6bac2503d76d1d38e38d (diff) | |
download | chromium_src-7ab5bbd128a32d32046201df76b86d370efa65af.zip chromium_src-7ab5bbd128a32d32046201df76b86d370efa65af.tar.gz chromium_src-7ab5bbd128a32d32046201df76b86d370efa65af.tar.bz2 |
Revert revert 62918 - net: clean up SSLHostInfo construction."
Was reverted in r62922 due to a change landing between the try run and the
commit.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_unittest.cc')
-rw-r--r-- | net/socket/ssl_client_socket_unittest.cc | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index b367a80..bfcbe81 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -67,7 +67,8 @@ TEST_F(SSLClientSocketTest, Connect) { scoped_ptr<net::SSLClientSocket> sock( socket_factory_->CreateSSLClientSocket(transport, - test_server.host_port_pair().host(), kDefaultSSLConfig)); + test_server.host_port_pair().host(), kDefaultSSLConfig, + NULL /* ssl_host_info */)); EXPECT_FALSE(sock->IsConnected()); @@ -110,7 +111,8 @@ TEST_F(SSLClientSocketTest, ConnectExpired) { scoped_ptr<net::SSLClientSocket> sock( socket_factory_->CreateSSLClientSocket(transport, - test_server.host_port_pair().host(), kDefaultSSLConfig)); + test_server.host_port_pair().host(), kDefaultSSLConfig, + NULL /* ssl_host_info */)); EXPECT_FALSE(sock->IsConnected()); @@ -152,7 +154,8 @@ TEST_F(SSLClientSocketTest, ConnectMismatched) { scoped_ptr<net::SSLClientSocket> sock( socket_factory_->CreateSSLClientSocket(transport, - test_server.host_port_pair().host(), kDefaultSSLConfig)); + test_server.host_port_pair().host(), kDefaultSSLConfig, + NULL /* ssl_host_info */)); EXPECT_FALSE(sock->IsConnected()); @@ -197,7 +200,8 @@ TEST_F(SSLClientSocketTest, FLAKY_ConnectClientAuthCertRequested) { scoped_ptr<net::SSLClientSocket> sock( socket_factory_->CreateSSLClientSocket(transport, - test_server.host_port_pair().host(), kDefaultSSLConfig)); + test_server.host_port_pair().host(), kDefaultSSLConfig, + NULL /* ssl_host_info */)); EXPECT_FALSE(sock->IsConnected()); @@ -247,7 +251,8 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthSendNullCert) { scoped_ptr<net::SSLClientSocket> sock( socket_factory_->CreateSSLClientSocket(transport, - test_server.host_port_pair().host(), ssl_config)); + test_server.host_port_pair().host(), ssl_config, + NULL /* ssl_host_info */)); EXPECT_FALSE(sock->IsConnected()); @@ -297,7 +302,8 @@ TEST_F(SSLClientSocketTest, Read) { socket_factory_->CreateSSLClientSocket( transport, test_server.host_port_pair().host(), - kDefaultSSLConfig)); + kDefaultSSLConfig, + NULL /* ssl_host_info */)); rv = sock->Connect(&callback); if (rv != net::OK) { @@ -357,7 +363,8 @@ TEST_F(SSLClientSocketTest, Read_FullDuplex) { socket_factory_->CreateSSLClientSocket( transport, test_server.host_port_pair().host(), - kDefaultSSLConfig)); + kDefaultSSLConfig, + NULL /* ssl_host_info */)); rv = sock->Connect(&callback); if (rv != net::OK) { @@ -414,7 +421,8 @@ TEST_F(SSLClientSocketTest, Read_SmallChunks) { scoped_ptr<net::SSLClientSocket> sock( socket_factory_->CreateSSLClientSocket(transport, - test_server.host_port_pair().host(), kDefaultSSLConfig)); + test_server.host_port_pair().host(), kDefaultSSLConfig, + NULL /* ssl_host_info */)); rv = sock->Connect(&callback); if (rv != net::OK) { @@ -467,7 +475,8 @@ TEST_F(SSLClientSocketTest, Read_Interrupted) { scoped_ptr<net::SSLClientSocket> sock( socket_factory_->CreateSSLClientSocket(transport, - test_server.host_port_pair().host(), kDefaultSSLConfig)); + test_server.host_port_pair().host(), kDefaultSSLConfig, + NULL /* ssl_host_info */)); rv = sock->Connect(&callback); if (rv != net::OK) { @@ -540,7 +549,8 @@ TEST_F(SSLClientSocketTest, PrematureApplicationData) { scoped_ptr<net::SSLClientSocket> sock( socket_factory_->CreateSSLClientSocket( - transport, test_server.host_port_pair().host(), kDefaultSSLConfig)); + transport, test_server.host_port_pair().host(), kDefaultSSLConfig, + NULL /* ssl_host_info */)); rv = sock->Connect(&callback); EXPECT_EQ(net::ERR_SSL_PROTOCOL_ERROR, rv); |