summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 22:26:29 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 22:26:29 +0000
commit34e3be8355b2fd61cd999226c4b8043af6c2200a (patch)
tree46ab94ce387e77d1d97c05f1aeef1ba168c73246 /jingle
parent447af0b1e8ca4638cdcc554ca5e3583015f23e60 (diff)
downloadchromium_src-34e3be8355b2fd61cd999226c4b8043af6c2200a.zip
chromium_src-34e3be8355b2fd61cd999226c4b8043af6c2200a.tar.gz
chromium_src-34e3be8355b2fd61cd999226c4b8043af6c2200a.tar.bz2
Revert "net: Plumb DnsCertProvenanceChecker around."
This reverts commit r66623. Some how it causes libnspr4.dll to be linked in Chrome Frame builds. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66687 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, 4 insertions, 5 deletions
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/notifier/base/xmpp_client_socket_factory.cc
index 0de822a..c290325 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::DnsCertProvenanceChecker* dns_cert_checker) {
+ net::DnsRRResolver* dnsrr_resolver) {
return client_socket_factory_->CreateSSLClientSocket(
transport_socket, host_and_port, ssl_config, ssl_host_info,
- dns_cert_checker);
+ dnsrr_resolver);
}
} // namespace
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h
index fef3bfa..e629be6 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 DnsCertProvenanceChecker;
+class DnsRRResolver;
class HostPortPair;
class SSLHostInfo;
}
@@ -33,8 +33,7 @@ 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::DnsCertProvenanceChecker* dns_cert_checker);
+ net::SSLHostInfo* ssl_host_info, net::DnsRRResolver* dnsrr_resolver);
private:
net::ClientSocketFactory* const client_socket_factory_;