summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-22 19:33:18 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-22 19:33:18 +0000
commit345c613b60d6f2b4cce28dcc130b37057d94759b (patch)
treefa732fc44ec95b03fde762f21ee602c4960f3860 /jingle
parentfb4c1c787dcb0b082c5c4a65445df1bf65b71519 (diff)
downloadchromium_src-345c613b60d6f2b4cce28dcc130b37057d94759b.zip
chromium_src-345c613b60d6f2b4cce28dcc130b37057d94759b.tar.gz
chromium_src-345c613b60d6f2b4cce28dcc130b37057d94759b.tar.bz2
Revert "Revert "net: Plumb DnsCertProvenanceChecker around.""
(See r66623 for details.) git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/base/xmpp_client_socket_factory.cc4
-rw-r--r--jingle/notifier/base/xmpp_client_socket_factory.h5
2 files changed, 5 insertions, 4 deletions
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_;