Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(698)

Unified Diff: net/socket/client_socket_factory.h

Issue 2870030: Implement SSLClientSocketPool. (Closed)
Patch Set: Rebase and fix mac compile error Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();

Powered by Google App Engine
This is Rietveld 408576698