diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 16:48:46 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 16:48:46 +0000 |
| commit | efe22215cad3c4541a443339d948c226d54e44c5 (patch) | |
| tree | 2e8f8489f6b89a594bdb891120324c730178a087 /jingle | |
| parent | f18531246f728226c9b2a62f425dfb8db38af243 (diff) | |
| download | chromium_src-efe22215cad3c4541a443339d948c226d54e44c5.zip chromium_src-efe22215cad3c4541a443339d948c226d54e44c5.tar.gz chromium_src-efe22215cad3c4541a443339d948c226d54e44c5.tar.bz2 | |
Remove SSLHostInfo.
BUG=105208
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/notifier/base/chrome_async_socket_unittest.cc | 2 | ||||
| -rw-r--r-- | jingle/notifier/base/proxy_resolving_client_socket.cc | 1 | ||||
| -rw-r--r-- | jingle/notifier/base/xmpp_client_socket_factory.cc | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/jingle/notifier/base/chrome_async_socket_unittest.cc b/jingle/notifier/base/chrome_async_socket_unittest.cc index 00eb8ac..ce97531 100644 --- a/jingle/notifier/base/chrome_async_socket_unittest.cc +++ b/jingle/notifier/base/chrome_async_socket_unittest.cc @@ -123,7 +123,7 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory { net::SSLClientSocketContext context; context.cert_verifier = cert_verifier_.get(); return mock_client_socket_factory_->CreateSSLClientSocket( - transport_socket, host_and_port, ssl_config_, NULL, context); + transport_socket, host_and_port, ssl_config_, context); } private: diff --git a/jingle/notifier/base/proxy_resolving_client_socket.cc b/jingle/notifier/base/proxy_resolving_client_socket.cc index 9329c29..9abe6e3 100644 --- a/jingle/notifier/base/proxy_resolving_client_socket.cc +++ b/jingle/notifier/base/proxy_resolving_client_socket.cc @@ -55,7 +55,6 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( // transport_security_state is NULL because it's not thread safe. session_params.transport_security_state = NULL; session_params.proxy_service = request_context->proxy_service(); - session_params.ssl_host_info_factory = NULL; session_params.ssl_config_service = request_context->ssl_config_service(); session_params.http_auth_handler_factory = request_context->http_auth_handler_factory(); diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/notifier/base/xmpp_client_socket_factory.cc index 22ae27c..2594084 100644 --- a/jingle/notifier/base/xmpp_client_socket_factory.cc +++ b/jingle/notifier/base/xmpp_client_socket_factory.cc @@ -49,7 +49,7 @@ net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket( // TODO(rkn): context.server_bound_cert_service is NULL because the // ServerBoundCertService class is not thread safe. return client_socket_factory_->CreateSSLClientSocket( - transport_socket, host_and_port, ssl_config_, NULL, context); + transport_socket, host_and_port, ssl_config_, context); } |