diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 21:48:42 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 21:48:42 +0000 |
| commit | db36938cb26cf265a5fd93690a8e783d01406958 (patch) | |
| tree | 7261d389592cdfbbb3063f223455518db12d3bda /webkit | |
| parent | 0d1872ebba9b790f3a33bcaecc11258ea924b397 (diff) | |
| download | chromium_src-db36938cb26cf265a5fd93690a8e783d01406958.zip chromium_src-db36938cb26cf265a5fd93690a8e783d01406958.tar.gz chromium_src-db36938cb26cf265a5fd93690a8e783d01406958.tar.bz2 | |
Pref-backed SSLConfigService for Linux.
Makes SSLConfigService into a ref-counted interface, and makes Profile own an SSLConfigServiceFactory which is used to create the SSLConfigService and pass it through the URLRequestContext on down to where it is actually used.
R=eroman,wtc
BUG=11507,19290
Review URL: http://codereview.chromium.org/165003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell_request_context.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index 703d316..4b680d6 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -4,8 +4,15 @@ #include "webkit/tools/test_shell/test_shell_request_context.h" +#include "build/build_config.h" + #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/ftp/ftp_network_layer.h" #include "net/proxy/proxy_service.h" #include "webkit/glue/webkit_glue.h" @@ -46,12 +53,19 @@ 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 net::HttpCache *cache; if (cache_path.empty()) { - cache = new net::HttpCache(host_resolver_, proxy_service_, 0); + cache = new net::HttpCache(host_resolver_, proxy_service_, + ssl_config_service_, 0); } else { - cache = new net::HttpCache(host_resolver_, proxy_service_, cache_path, 0); + cache = new net::HttpCache(host_resolver_, proxy_service_, + ssl_config_service_, cache_path, 0); } cache->set_mode(cache_mode); http_transaction_factory_ = cache; |