From 62426e79edb8654e1f748d2b7c1dc8d20ccce151 Mon Sep 17 00:00:00 2001 From: "agl@chromium.org" Date: Mon, 22 Nov 2010 18:11:47 +0000 Subject: net: Plumb DnsCertProvenanceChecker around. (Reland of r66623, reverted in r66687 due to Chrome Frame linking issues.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66970 0039d316-1c4b-4281-b951-d872f2087c98 --- jingle/notifier/base/xmpp_client_socket_factory.cc | 4 ++-- jingle/notifier/base/xmpp_client_socket_factory.h | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'jingle/notifier') diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/notifier/base/xmpp_client_socket_factory.cc index c290325..0de822a 100644 --- a/jingle/notifier/base/xmpp_client_socket_factory.cc +++ b/jingle/notifier/base/xmpp_client_socket_factory.cc @@ -35,10 +35,10 @@ net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket( const net::HostPortPair& host_and_port, const net::SSLConfig& ssl_config, net::SSLHostInfo* ssl_host_info, - net::DnsRRResolver* dnsrr_resolver) { + net::DnsCertProvenanceChecker* dns_cert_checker) { return client_socket_factory_->CreateSSLClientSocket( transport_socket, host_and_port, ssl_config, ssl_host_info, - dnsrr_resolver); + dns_cert_checker); } } // namespace diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h index e629be6..fef3bfa 100644 --- a/jingle/notifier/base/xmpp_client_socket_factory.h +++ b/jingle/notifier/base/xmpp_client_socket_factory.h @@ -10,7 +10,7 @@ #include "net/socket/client_socket_factory.h" namespace net { -class DnsRRResolver; +class DnsCertProvenanceChecker; class HostPortPair; class SSLHostInfo; } @@ -33,7 +33,8 @@ class XmppClientSocketFactory : public net::ClientSocketFactory { virtual net::SSLClientSocket* CreateSSLClientSocket( net::ClientSocketHandle* transport_socket, const net::HostPortPair& host_and_port, const net::SSLConfig& ssl_config, - net::SSLHostInfo* ssl_host_info, net::DnsRRResolver* dnsrr_resolver); + net::SSLHostInfo* ssl_host_info, + net::DnsCertProvenanceChecker* dns_cert_checker); private: net::ClientSocketFactory* const client_socket_factory_; -- cgit v1.1