summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 13:28:28 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 13:28:28 +0000
commit8281f7022c819a13d5d1741d2c1ff73aa4e994a9 (patch)
tree7fcb40be8d7a09b8a55800250a14d496fce5646c /jingle
parent46aeaa8e2c32a014c9d4641ceb6e75954f0bb3a0 (diff)
downloadchromium_src-8281f7022c819a13d5d1741d2c1ff73aa4e994a9.zip
chromium_src-8281f7022c819a13d5d1741d2c1ff73aa4e994a9.tar.gz
chromium_src-8281f7022c819a13d5d1741d2c1ff73aa4e994a9.tar.bz2
net: clean up SSLHostInfo construction.
Create an SSLHostInfoFactory interface and plumb it from the HttpCache to the SSLConnectJob. Also, move the SSLHostInfo reference from the ssl_config to being passed to the SSLClientSocket. BUG=none TEST=net_unittests Review URL: http://codereview.chromium.org/3747003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/base/chrome_async_socket.cc3
-rw-r--r--jingle/notifier/base/xmpp_client_socket_factory.cc5
-rw-r--r--jingle/notifier/base/xmpp_client_socket_factory.h6
3 files changed, 10 insertions, 4 deletions
diff --git a/jingle/notifier/base/chrome_async_socket.cc b/jingle/notifier/base/chrome_async_socket.cc
index b3ac52a..4858bab 100644
--- a/jingle/notifier/base/chrome_async_socket.cc
+++ b/jingle/notifier/base/chrome_async_socket.cc
@@ -435,7 +435,8 @@ bool ChromeAsyncSocket::StartTls(const std::string& domain_name) {
DCHECK(transport_socket_.get());
transport_socket_.reset(
client_socket_factory_->CreateSSLClientSocket(
- transport_socket_.release(), domain_name, ssl_config_));
+ transport_socket_.release(), domain_name, ssl_config_,
+ NULL /* ssl_host_info */));
int status = transport_socket_->Connect(&ssl_connect_callback_);
if (status != net::ERR_IO_PENDING) {
MessageLoop* message_loop = MessageLoop::current();
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/notifier/base/xmpp_client_socket_factory.cc
index c0ced61..78cb1bc 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.cc
+++ b/jingle/notifier/base/xmpp_client_socket_factory.cc
@@ -33,9 +33,10 @@ net::ClientSocket* XmppClientSocketFactory::CreateTCPClientSocket(
net::SSLClientSocket* XmppClientSocketFactory::CreateSSLClientSocket(
net::ClientSocketHandle* transport_socket,
const std::string& hostname,
- const net::SSLConfig& ssl_config) {
+ const net::SSLConfig& ssl_config,
+ net::SSLHostInfo* ssl_host_info) {
return client_socket_factory_->CreateSSLClientSocket(
- transport_socket, hostname, ssl_config);
+ transport_socket, hostname, ssl_config, ssl_host_info);
}
} // namespace
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h
index 73b2d8d..eb94555 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.h
+++ b/jingle/notifier/base/xmpp_client_socket_factory.h
@@ -9,6 +9,10 @@
#include "net/socket/client_socket_factory.h"
+namespace net {
+class SSLHostInfo;
+}
+
namespace notifier {
class XmppClientSocketFactory : public net::ClientSocketFactory {
@@ -26,7 +30,7 @@ class XmppClientSocketFactory : public net::ClientSocketFactory {
const net::NetLog::Source& source);
virtual net::SSLClientSocket* CreateSSLClientSocket(
net::ClientSocketHandle* transport_socket, const std::string& hostname,
- const net::SSLConfig& ssl_config);
+ const net::SSLConfig& ssl_config, net::SSLHostInfo* ssl_host_info);
private:
net::ClientSocketFactory* const client_socket_factory_;