From 7ab5bbd128a32d32046201df76b86d370efa65af Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Tue, 19 Oct 2010 13:33:21 +0000 Subject: 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 --- net/socket/socket_test_util.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'net/socket/socket_test_util.h') diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index eb54b84..445f3c7 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h @@ -48,6 +48,7 @@ enum { class ClientSocket; class MockClientSocket; class SSLClientSocket; +class SSLHostInfo; struct MockConnect { // Asynchronous connection success. @@ -533,7 +534,8 @@ class MockClientSocketFactory : public ClientSocketFactory { virtual SSLClientSocket* CreateSSLClientSocket( ClientSocketHandle* transport_socket, const std::string& hostname, - const SSLConfig& ssl_config); + const SSLConfig& ssl_config, + SSLHostInfo* ssl_host_info); SocketDataProviderArray& mock_data() { return mock_data_; } @@ -688,6 +690,7 @@ class MockSSLClientSocket : public MockClientSocket { net::ClientSocketHandle* transport_socket, const std::string& hostname, const net::SSLConfig& ssl_config, + SSLHostInfo* ssl_host_info, net::SSLSocketDataProvider* socket); ~MockSSLClientSocket(); @@ -868,7 +871,8 @@ class DeterministicMockClientSocketFactory : public ClientSocketFactory { virtual SSLClientSocket* CreateSSLClientSocket( ClientSocketHandle* transport_socket, const std::string& hostname, - const SSLConfig& ssl_config); + const SSLConfig& ssl_config, + SSLHostInfo* ssl_host_info); SocketDataProviderArray& mock_data() { return mock_data_; -- cgit v1.1