| Index: net/socket/client_socket_factory.h
|
| diff --git a/net/socket/client_socket_factory.h b/net/socket/client_socket_factory.h
|
| index b519b327f124b4153c265daa6b802af6a67ec213..dddf1de8d664deb848fae5a17fb0ade3834ad105 100644
|
| --- a/net/socket/client_socket_factory.h
|
| +++ b/net/socket/client_socket_factory.h
|
| @@ -11,13 +11,14 @@ namespace net {
|
|
|
| class AddressList;
|
| class ClientSocket;
|
| +class ClientSocketHandle;
|
| class NetLog;
|
| class SSLClientSocket;
|
| struct SSLConfig;
|
|
|
| // Callback function to create new SSLClientSocket objects.
|
| typedef SSLClientSocket* (*SSLClientSocketFactory)(
|
| - ClientSocket* transport_socket,
|
| + ClientSocketHandle* transport_socket,
|
| const std::string& hostname,
|
| const SSLConfig& ssl_config);
|
|
|
| @@ -31,10 +32,16 @@ class ClientSocketFactory {
|
| const AddressList& addresses, NetLog* net_log) = 0;
|
|
|
| virtual SSLClientSocket* CreateSSLClientSocket(
|
| - ClientSocket* transport_socket,
|
| + ClientSocketHandle* transport_socket,
|
| const std::string& hostname,
|
| const SSLConfig& ssl_config) = 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);
|
| +
|
| // Returns the default ClientSocketFactory.
|
| static ClientSocketFactory* GetDefaultFactory();
|
|
|
|
|