diff options
| -rw-r--r-- | net/net.gyp | 14 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_mac_factory.cc | 24 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_mac_factory.h | 27 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_nss_factory.cc | 29 | ||||
| -rw-r--r-- | net/socket/ssl_client_socket_nss_factory.h | 27 |
5 files changed, 0 insertions, 121 deletions
diff --git a/net/net.gyp b/net/net.gyp index 58cf8fe..df9f2f8 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -614,12 +614,8 @@ 'socket/ssl_client_socket.h', 'socket/ssl_client_socket_mac.cc', 'socket/ssl_client_socket_mac.h', - 'socket/ssl_client_socket_mac_factory.cc', - 'socket/ssl_client_socket_mac_factory.h', 'socket/ssl_client_socket_nss.cc', 'socket/ssl_client_socket_nss.h', - 'socket/ssl_client_socket_nss_factory.cc', - 'socket/ssl_client_socket_nss_factory.h', 'socket/ssl_client_socket_openssl.cc', 'socket/ssl_client_socket_openssl.h', 'socket/ssl_client_socket_pool.cc', @@ -765,8 +761,6 @@ 'socket/nss_ssl_util.h', 'socket/ssl_client_socket_nss.cc', 'socket/ssl_client_socket_nss.h', - 'socket/ssl_client_socket_nss_factory.cc', - 'socket/ssl_client_socket_nss_factory.h', 'socket/ssl_server_socket_nss.cc', 'socket/ssl_server_socket_nss.h', ], @@ -821,8 +815,6 @@ ], 'sources!': [ 'proxy/proxy_resolver_winhttp.cc', - 'socket/ssl_client_socket_nss_factory.cc', - 'socket/ssl_client_socket_nss_factory.h', ], }, ], @@ -838,12 +830,6 @@ ] }, }, - { # else: OS != "mac" - 'sources!': [ - 'socket/ssl_client_socket_mac_factory.cc', - 'socket/ssl_client_socket_mac_factory.h', - ], - }, ], ], }, diff --git a/net/socket/ssl_client_socket_mac_factory.cc b/net/socket/ssl_client_socket_mac_factory.cc deleted file mode 100644 index 211e2a4..0000000 --- a/net/socket/ssl_client_socket_mac_factory.cc +++ /dev/null @@ -1,24 +0,0 @@ -// 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. - -#include "net/socket/client_socket_factory.h" - -#include "net/socket/ssl_client_socket_mac.h" -#include "net/socket/ssl_host_info.h" - -namespace net { - -SSLClientSocket* SSLClientSocketMacFactory( - ClientSocketHandle* transport_socket, - const HostPortPair& host_and_port, - const SSLConfig& ssl_config, - SSLHostInfo* ssl_host_info, - CertVerifier* cert_verifier, - DnsCertProvenanceChecker* dns_cert_checker) { - delete ssl_host_info; - return new SSLClientSocketMac(transport_socket, host_and_port, ssl_config, - cert_verifier); -} - -} // namespace net diff --git a/net/socket/ssl_client_socket_mac_factory.h b/net/socket/ssl_client_socket_mac_factory.h deleted file mode 100644 index ebda9c3..0000000 --- a/net/socket/ssl_client_socket_mac_factory.h +++ /dev/null @@ -1,27 +0,0 @@ -// 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_MAC_FACTORY_H_ -#define NET_SOCKET_SSL_CLIENT_SOCKET_MAC_FACTORY_H_ -#pragma once - -#include "net/socket/client_socket_factory.h" - -namespace net { - -class DnsCertProvenanceChecker; -class SSLHostInfo; - -// Creates SSLClientSocketMac objects. -SSLClientSocket* SSLClientSocketMacFactory( - ClientSocketHandle* transport_socket, - const HostPortPair& host_and_port, - const SSLConfig& ssl_config, - SSLHostInfo* ssl_host_info, - CertVerifier* cert_verifier, - DnsCertProvenanceChecker* dns_cert_checker); - -} // namespace net - -#endif // NET_SOCKET_SSL_CLIENT_SOCKET_MAC_FACTORY_H_ diff --git a/net/socket/ssl_client_socket_nss_factory.cc b/net/socket/ssl_client_socket_nss_factory.cc deleted file mode 100644 index 435ddff..0000000 --- a/net/socket/ssl_client_socket_nss_factory.cc +++ /dev/null @@ -1,29 +0,0 @@ -// 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. - -#include "net/socket/client_socket_factory.h" - -#include "net/socket/ssl_client_socket_nss.h" -#include "net/socket/ssl_host_info.h" - -// This file is only used on platforms where NSS is not the system SSL -// library. When compiled, this file is the only object module that pulls -// in the dependency on NSPR and NSS. This allows us to control which -// projects depend on NSPR and NSS on those platforms. - -namespace net { - -SSLClientSocket* SSLClientSocketNSSFactory( - ClientSocketHandle* transport_socket, - const HostPortPair& host_and_port, - const SSLConfig& ssl_config, - SSLHostInfo* ssl_host_info, - CertVerifier* cert_verifier, - DnsCertProvenanceChecker* dns_cert_checker) { - scoped_ptr<SSLHostInfo> shi(ssl_host_info); - return new SSLClientSocketNSS(transport_socket, host_and_port, ssl_config, - shi.release(), cert_verifier, dns_cert_checker); -} - -} // namespace net diff --git a/net/socket/ssl_client_socket_nss_factory.h b/net/socket/ssl_client_socket_nss_factory.h deleted file mode 100644 index ed5e588..0000000 --- a/net/socket/ssl_client_socket_nss_factory.h +++ /dev/null @@ -1,27 +0,0 @@ -// 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_ -#pragma once - -#include "net/socket/client_socket_factory.h" - -namespace net { - -class DnsCertProvenanceChecker; -class SSLHostInfo; - -// Creates SSLClientSocketNSS objects. -SSLClientSocket* SSLClientSocketNSSFactory( - ClientSocketHandle* transport_socket, - const HostPortPair& host_and_port, - const SSLConfig& ssl_config, - SSLHostInfo* ssl_host_info, - CertVerifier* cert_verifier, - DnsCertProvenanceChecker* dns_cert_checker); - -} // namespace net - -#endif // NET_SOCKET_SSL_CLIENT_SOCKET_NSS_FACTORY_H_ |