diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 18:31:29 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-06 18:31:29 +0000 |
| commit | 7e19edf7255b366b5e4b9b0bb77caf9842a37f1b (patch) | |
| tree | 5f347eeac6bd1de60cbc2edc9095038d07618a56 /webkit/tools | |
| parent | 71c293a56a92101c17da89423ccdef19d1a9c8b8 (diff) | |
| download | chromium_src-7e19edf7255b366b5e4b9b0bb77caf9842a37f1b.zip chromium_src-7e19edf7255b366b5e4b9b0bb77caf9842a37f1b.tar.gz chromium_src-7e19edf7255b366b5e4b9b0bb77caf9842a37f1b.tar.bz2 | |
Always use NSS for SSL in test_shell.exe on Windows.
R=agl,willchan
BUG=43142
TEST=All layout tests should pass on Windows.
Review URL: http://codereview.chromium.org/2012002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_request_context.cc | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index 66f3b17..64563e7 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -7,6 +7,9 @@ #include "build/build_config.h" #include "base/file_path.h" +#if defined(OS_WIN) +#include "base/nss_util.h" +#endif #include "net/base/cookie_monster.h" #include "net/base/host_resolver.h" #include "net/base/ssl_config_service.h" @@ -16,6 +19,9 @@ #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" +#if defined(OS_WIN) +#include "net/socket/ssl_client_socket_nss_factory.h" +#endif #include "webkit/glue/webkit_glue.h" TestShellRequestContext::TestShellRequestContext() { @@ -63,6 +69,15 @@ void TestShellRequestContext::Init( http_auth_handler_factory_ = net::HttpAuthHandlerFactory::CreateDefault(); +#if defined(OS_WIN) + // Use NSS for SSL on Windows. TODO(wtc): this should eventually be hidden + // inside DefaultClientSocketFactory::CreateSSLClientSocket. + net::ClientSocketFactory::SetSSLClientSocketFactory( + net::SSLClientSocketNSSFactory); + // We want to be sure to init NSPR on the main thread. + base::EnsureNSPRInit(); +#endif + net::HttpCache *cache; if (cache_path.empty()) { cache = new net::HttpCache(NULL, host_resolver_, proxy_service_, |