summaryrefslogtreecommitdiffstats
path: root/net/socket/client_socket_factory.h
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 /net/socket/client_socket_factory.h
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 'net/socket/client_socket_factory.h')
-rw-r--r--net/socket/client_socket_factory.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/net/socket/client_socket_factory.h b/net/socket/client_socket_factory.h
index 97fb361..ad2cc54 100644
--- a/net/socket/client_socket_factory.h
+++ b/net/socket/client_socket_factory.h
@@ -17,12 +17,14 @@ class ClientSocket;
class ClientSocketHandle;
class SSLClientSocket;
struct SSLConfig;
+class SSLHostInfo;
// Callback function to create new SSLClientSocket objects.
typedef SSLClientSocket* (*SSLClientSocketFactory)(
ClientSocketHandle* transport_socket,
const std::string& hostname,
- const SSLConfig& ssl_config);
+ const SSLConfig& ssl_config,
+ SSLHostInfo* ssl_host_info);
// An interface used to instantiate ClientSocket objects. Used to facilitate
// testing code with mock socket implementations.
@@ -40,13 +42,14 @@ class ClientSocketFactory {
virtual SSLClientSocket* CreateSSLClientSocket(
ClientSocketHandle* transport_socket,
const std::string& hostname,
- const SSLConfig& ssl_config) = 0;
-
+ const SSLConfig& ssl_config,
+ SSLHostInfo* ssl_host_info) = 0;
// Deprecated function (http://crbug.com/37810) that takes a ClientSocket.
virtual SSLClientSocket* CreateSSLClientSocket(ClientSocket* transport_socket,
const std::string& hostname,
- const SSLConfig& ssl_config);
+ const SSLConfig& ssl_config,
+ SSLHostInfo* ssl_host_info);
// Returns the default ClientSocketFactory.
static ClientSocketFactory* GetDefaultFactory();