summaryrefslogtreecommitdiffstats
path: root/net/base/client_socket_factory.cc
diff options
context:
space:
mode:
authorwtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-15 00:20:11 +0000
committerwtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-15 00:20:11 +0000
commitaaead5019627818c93693fdb6ec04d47b47c17f2 (patch)
tree6ff15880c597bb59a8c3def51d13ce492a4bb405 /net/base/client_socket_factory.cc
parent1ad083f293cd321fa7d7c8f14e71816571c6c54f (diff)
downloadchromium_src-aaead5019627818c93693fdb6ec04d47b47c17f2.zip
chromium_src-aaead5019627818c93693fdb6ec04d47b47c17f2.tar.gz
chromium_src-aaead5019627818c93693fdb6ec04d47b47c17f2.tar.bz2
Turn SSLClientSocket into an interface.
The original ssl_client_socket.{h,cc} are renamed ssl_client_socket_win.{h,cc}. The new ssl_client_socket.h defines the SSLClientSocket interface, which simply extends the ClientSocket interface with a new GetSSLInfo method. ClientSocketFactory::CreateSSLClientSocket returns SSLClientSocket* instead of ClientSocket*. Replace the SSL protocol version mask parameter to the constructor and factory method by a SSLConfig parameter. R=darin Review URL: http://codereview.chromium.org/7304 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/client_socket_factory.cc')
-rw-r--r--net/base/client_socket_factory.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/base/client_socket_factory.cc b/net/base/client_socket_factory.cc
index 43df0e6..10f24df 100644
--- a/net/base/client_socket_factory.cc
+++ b/net/base/client_socket_factory.cc
@@ -7,7 +7,7 @@
#include "base/singleton.h"
#include "build/build_config.h"
#if defined(OS_WIN)
-#include "net/base/ssl_client_socket.h"
+#include "net/base/ssl_client_socket_win.h"
#endif
#include "net/base/tcp_client_socket.h"
@@ -20,13 +20,12 @@ class DefaultClientSocketFactory : public ClientSocketFactory {
return new TCPClientSocket(addresses);
}
- virtual ClientSocket* CreateSSLClientSocket(
+ virtual SSLClientSocket* CreateSSLClientSocket(
ClientSocket* transport_socket,
const std::string& hostname,
- int protocol_version_mask) {
+ const SSLConfig& ssl_config) {
#if defined(OS_WIN)
- return new SSLClientSocket(transport_socket, hostname,
- protocol_version_mask);
+ return new SSLClientSocketWin(transport_socket, hostname, ssl_config);
#else
// TODO(pinkerton): turn on when we port SSL socket from win32
NOTIMPLEMENTED();