diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 21:35:19 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-23 21:35:19 +0000 |
| commit | 2380f378654e66f58262e3eaa1f9ba0cd1da09e0 (patch) | |
| tree | cd9202c3cfd4a88a619604a7d59ee3184b94a29b /net/socket/client_socket_factory.h | |
| parent | b4ce3c22d957e8c6128e7e1dd7434b5cd0e61008 (diff) | |
| download | chromium_src-2380f378654e66f58262e3eaa1f9ba0cd1da09e0.zip chromium_src-2380f378654e66f58262e3eaa1f9ba0cd1da09e0.tar.gz chromium_src-2380f378654e66f58262e3eaa1f9ba0cd1da09e0.tar.bz2 | |
Remove the workaround for bug 43461. Use a g_use_system_ssl
boolean flag in DefaultClientSocketFactory::CreateSSLClientSocket.
Based on rch's code in http://codereview.chromium.org/6487012.
R=rch
BUG=43461
TEST=no ChromeFrame test program build failures.
Review URL: http://codereview.chromium.org/6561003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_factory.h')
| -rw-r--r-- | net/socket/client_socket_factory.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/net/socket/client_socket_factory.h b/net/socket/client_socket_factory.h index 2a0cd7c..b750a0d 100644 --- a/net/socket/client_socket_factory.h +++ b/net/socket/client_socket_factory.h @@ -23,15 +23,6 @@ class SSLClientSocket; struct SSLConfig; class SSLHostInfo; -// Callback function to create new SSLClientSocket objects. -typedef SSLClientSocket* (*SSLClientSocketFactory)( - ClientSocketHandle* transport_socket, - const HostPortPair& host_and_port, - const SSLConfig& ssl_config, - SSLHostInfo* ssl_host_info, - CertVerifier* cert_verifier, - DnsCertProvenanceChecker* dns_cert_checker); - // An interface used to instantiate ClientSocket objects. Used to facilitate // testing code with mock socket implementations. class ClientSocketFactory { @@ -64,9 +55,8 @@ class ClientSocketFactory { // Returns the default ClientSocketFactory. static ClientSocketFactory* GetDefaultFactory(); - // Instructs the default ClientSocketFactory to use |factory| to create - // SSLClientSocket objects. - static void SetSSLClientSocketFactory(SSLClientSocketFactory factory); + // Instructs the default ClientSocketFactory to use the system SSL library. + static void UseSystemSSL(); }; } // namespace net |