diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 19:48:39 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-21 19:48:39 +0000 |
| commit | e52deec956c1e94323cc001d42cdb245cff539af (patch) | |
| tree | 8acfeaf3e16650fd4e5920deb5f338e6ab109e08 /webkit | |
| parent | ae09ca6b5ae2e930ef40fd291a08afd1289fafa1 (diff) | |
| download | chromium_src-e52deec956c1e94323cc001d42cdb245cff539af.zip chromium_src-e52deec956c1e94323cc001d42cdb245cff539af.tar.gz chromium_src-e52deec956c1e94323cc001d42cdb245cff539af.tar.bz2 | |
Cleanups for SSLConfigService and SSLConfigServiceManager.
Make SSLConfig.rev_checking_enable default to true (which also affects the defaults set by SSLConfigServicePref.)
Add static SSLConfigService::CreateSystemSSLConfigService which creates a standalone SSLConfigService (either SSLConfigServiceWin or SSLConfigServiceDefaults.)
Use CreateSystemSSLConfigService in fetch_client and test_shell_request_context.
Merge SSLConfigServiceManagerWin and SSLConfigServiceManagerDefaults into SSLConfigServiceManagerSystem, which uses CreateSystemSSLConfigService.
BUG=11507,19290
TEST=only visible change should be linux defaults to having rev checking option enabled.
Review URL: http://codereview.chromium.org/173097
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_request_context.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index 4b680d6..b5c86e5 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -8,11 +8,7 @@ #include "net/base/cookie_monster.h" #include "net/base/host_resolver.h" -#if defined(OS_WIN) -#include "net/base/ssl_config_service_win.h" -#else -#include "net/base/ssl_config_service_defaults.h" -#endif +#include "net/base/ssl_config_service.h" #include "net/ftp/ftp_network_layer.h" #include "net/proxy/proxy_service.h" #include "webkit/glue/webkit_glue.h" @@ -53,11 +49,7 @@ void TestShellRequestContext::Init( host_resolver_ = net::CreateSystemHostResolver(); proxy_service_ = net::ProxyService::Create(no_proxy ? &proxy_config : NULL, false, NULL, NULL); -#if defined(OS_WIN) - ssl_config_service_ = new net::SSLConfigServiceWin; -#else - ssl_config_service_ = new net::SSLConfigServiceDefaults; -#endif + ssl_config_service_ = net::SSLConfigService::CreateSystemSSLConfigService(); net::HttpCache *cache; if (cache_path.empty()) { |