diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 02:02:22 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 02:02:22 +0000 |
| commit | e0da37dfb035ba050fbc0d7f83a205bab9493e22 (patch) | |
| tree | 68ee9de464d0b6d779fb615d80c058030d7e474a /webkit | |
| parent | f658af8bb836debbac7ca687634792d9dc6b9f87 (diff) | |
| download | chromium_src-e0da37dfb035ba050fbc0d7f83a205bab9493e22.zip chromium_src-e0da37dfb035ba050fbc0d7f83a205bab9493e22.tar.gz chromium_src-e0da37dfb035ba050fbc0d7f83a205bab9493e22.tar.bz2 | |
Use NSS for SSL by default on Mac OS X.
To use Mac OS X Secure Transport in Chromium, specify the --use-system-ssl
command-line switch, which also replaced the --use-schannel command-line
switch for Windows. All other programs are hardcoded to use NSS for SSL.
If SSL client authentication is requested, fall back on Mac OS X Secure
Transport for now.
R=mark,mbelshe
BUG=30689
TEST=none
Review URL: http://codereview.chromium.org/2747002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/simple_resource_loader_bridge.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc index d76a5fe..858391a 100644 --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc @@ -34,7 +34,7 @@ #include "base/file_path.h" #include "base/message_loop.h" -#if defined(OS_WIN) +#if defined(OS_MACOSX) || defined(OS_WIN) #include "base/nss_util.h" #endif #include "base/ref_counted.h" @@ -789,6 +789,8 @@ bool SimpleResourceLoaderBridge::EnsureIOThread() { // inside DefaultClientSocketFactory::CreateSSLClientSocket. net::ClientSocketFactory::SetSSLClientSocketFactory( net::SSLClientSocketNSSFactory); +#endif +#if defined(OS_MACOSX) || defined(OS_WIN) // We want to be sure to init NSPR on the main thread. base::EnsureNSPRInit(); #endif |