diff options
Diffstat (limited to 'net')
-rwxr-xr-x | net/net.gyp | 2 | ||||
-rw-r--r-- | net/socket/client_socket_factory.cc | 1 | ||||
-rw-r--r-- | net/socket/client_socket_factory.h | 6 | ||||
-rw-r--r-- | net/socket/ssl_client_socket_nss_factory.h | 20 |
4 files changed, 22 insertions, 7 deletions
diff --git a/net/net.gyp b/net/net.gyp index 15a1fc0..00f0615 100755 --- a/net/net.gyp +++ b/net/net.gyp @@ -418,6 +418,7 @@ 'socket/ssl_client_socket_mac.cc', 'socket/ssl_client_socket_mac.h', 'socket/ssl_client_socket_nss_factory.cc', + 'socket/ssl_client_socket_nss_factory.h', 'socket/ssl_client_socket_nss.cc', 'socket/ssl_client_socket_nss.h', 'socket/ssl_client_socket_win.cc', @@ -535,6 +536,7 @@ 'sources!': [ 'proxy/proxy_resolver_winhttp.cc', 'socket/ssl_client_socket_nss_factory.cc', + 'socket/ssl_client_socket_nss_factory.h', ], }, ], diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc index 6a3a4cc..4f05575 100644 --- a/net/socket/client_socket_factory.cc +++ b/net/socket/client_socket_factory.cc @@ -35,7 +35,6 @@ SSLClientSocket* DefaultSSLClientSocketFactory( #endif } -// True if we should use NSS instead of the system SSL library for SSL. SSLClientSocketFactory g_ssl_factory = DefaultSSLClientSocketFactory; class DefaultClientSocketFactory : public ClientSocketFactory { diff --git a/net/socket/client_socket_factory.h b/net/socket/client_socket_factory.h index 988cf97..1c97cd6 100644 --- a/net/socket/client_socket_factory.h +++ b/net/socket/client_socket_factory.h @@ -20,12 +20,6 @@ typedef SSLClientSocket* (*SSLClientSocketFactory)( const std::string& hostname, const SSLConfig& ssl_config); -// Creates SSLClientSocketNSS objects. -SSLClientSocket* SSLClientSocketNSSFactory( - ClientSocket* transport_socket, - const std::string& hostname, - const SSLConfig& ssl_config); - // An interface used to instantiate ClientSocket objects. Used to facilitate // testing code with mock socket implementations. class ClientSocketFactory { diff --git a/net/socket/ssl_client_socket_nss_factory.h b/net/socket/ssl_client_socket_nss_factory.h new file mode 100644 index 0000000..a835516 --- /dev/null +++ b/net/socket/ssl_client_socket_nss_factory.h @@ -0,0 +1,20 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef NET_SOCKET_SSL_CLIENT_SOCKET_NSS_FACTORY_H_ +#define NET_SOCKET_SSL_CLIENT_SOCKET_NSS_FACTORY_H_ + +#include "net/socket/client_socket_factory.h" + +namespace net { + +// Creates SSLClientSocketNSS objects. +SSLClientSocket* SSLClientSocketNSSFactory( + ClientSocket* transport_socket, + const std::string& hostname, + const SSLConfig& ssl_config); + +} // namespace net + +#endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_FACTORY_H_ |