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 /net/tools | |
| 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 'net/tools')
| -rw-r--r-- | net/tools/fetch/fetch_client.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc index f8b89df..ba78e22 100644 --- a/net/tools/fetch/fetch_client.cc +++ b/net/tools/fetch/fetch_client.cc @@ -14,11 +14,7 @@ #include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.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/http/http_cache.h" #include "net/http/http_network_layer.h" #include "net/http/http_request_info.h" @@ -138,14 +134,10 @@ int main(int argc, char**argv) { scoped_refptr<net::HostResolver> host_resolver( net::CreateSystemHostResolver()); - scoped_refptr<net::ProxyService> proxy_service(net::ProxyService::CreateNull()); -#if defined(OS_WIN) + scoped_refptr<net::ProxyService> proxy_service( + net::ProxyService::CreateNull()); scoped_refptr<net::SSLConfigService> ssl_config_service( - new net::SSLConfigServiceWin); -#else - scoped_refptr<net::SSLConfigService> ssl_config_service( - new net::SSLConfigServiceDefaults); -#endif + net::SSLConfigService::CreateSystemSSLConfigService()); net::HttpTransactionFactory* factory = NULL; if (use_cache) { factory = new net::HttpCache(host_resolver, proxy_service, |