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

Side by Side Diff: net/socket/client_socket_factory.cc

Issue 6800009: Attn: Mike Belshe Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 9 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/socket/client_socket_factory.h" 5 #include "net/socket/client_socket_factory.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "net/base/cert_database.h" 9 #include "net/base/cert_database.h"
10 #include "net/socket/client_socket_handle.h" 10 #include "net/socket/client_socket_handle.h"
11 #include "net/socket/sctp_client_socket.h"
11 #if defined(OS_WIN) 12 #if defined(OS_WIN)
12 #include "net/socket/ssl_client_socket_nss.h" 13 #include "net/socket/ssl_client_socket_nss.h"
13 #include "net/socket/ssl_client_socket_win.h" 14 #include "net/socket/ssl_client_socket_win.h"
14 #elif defined(USE_OPENSSL) 15 #elif defined(USE_OPENSSL)
15 #include "net/socket/ssl_client_socket_openssl.h" 16 #include "net/socket/ssl_client_socket_openssl.h"
16 #elif defined(USE_NSS) 17 #elif defined(USE_NSS)
17 #include "net/socket/ssl_client_socket_nss.h" 18 #include "net/socket/ssl_client_socket_nss.h"
18 #elif defined(OS_MACOSX) 19 #elif defined(OS_MACOSX)
19 #include "net/socket/ssl_client_socket_mac.h" 20 #include "net/socket/ssl_client_socket_mac.h"
20 #include "net/socket/ssl_client_socket_nss.h" 21 #include "net/socket/ssl_client_socket_nss.h"
(...skipping 24 matching lines...) Expand all
45 ClearSSLSessionCache(); 46 ClearSSLSessionCache();
46 } 47 }
47 48
48 virtual ClientSocket* CreateTCPClientSocket( 49 virtual ClientSocket* CreateTCPClientSocket(
49 const AddressList& addresses, 50 const AddressList& addresses,
50 NetLog* net_log, 51 NetLog* net_log,
51 const NetLog::Source& source) { 52 const NetLog::Source& source) {
52 return new TCPClientSocket(addresses, net_log, source); 53 return new TCPClientSocket(addresses, net_log, source);
53 } 54 }
54 55
56 virtual ClientSocket* CreateSCTPClientSocket(
57 const AddressList& addresses,
58 NetLog* net_log,
Mike Belshe 2011/04/06 18:32:53 Hopefully we get agreement to rename this and then
59 const NetLog::Source& source) {
60 return new SCTPClientSocket(addresses, net_log, source);
61 }
62
55 virtual SSLClientSocket* CreateSSLClientSocket( 63 virtual SSLClientSocket* CreateSSLClientSocket(
56 ClientSocketHandle* transport_socket, 64 ClientSocketHandle* transport_socket,
57 const HostPortPair& host_and_port, 65 const HostPortPair& host_and_port,
58 const SSLConfig& ssl_config, 66 const SSLConfig& ssl_config,
59 SSLHostInfo* ssl_host_info, 67 SSLHostInfo* ssl_host_info,
60 CertVerifier* cert_verifier, 68 CertVerifier* cert_verifier,
61 DnsCertProvenanceChecker* dns_cert_checker) { 69 DnsCertProvenanceChecker* dns_cert_checker) {
62 scoped_ptr<SSLHostInfo> shi(ssl_host_info); 70 scoped_ptr<SSLHostInfo> shi(ssl_host_info);
63 #if defined(OS_WIN) 71 #if defined(OS_WIN)
64 if (g_use_system_ssl) { 72 if (g_use_system_ssl) {
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 ClientSocketFactory* ClientSocketFactory::GetDefaultFactory() { 140 ClientSocketFactory* ClientSocketFactory::GetDefaultFactory() {
133 return g_default_client_socket_factory.Pointer(); 141 return g_default_client_socket_factory.Pointer();
134 } 142 }
135 143
136 // static 144 // static
137 void ClientSocketFactory::UseSystemSSL() { 145 void ClientSocketFactory::UseSystemSSL() {
138 g_use_system_ssl = true; 146 g_use_system_ssl = true;
139 } 147 }
140 148
141 } // namespace net 149 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698