diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 05:20:18 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 05:20:18 +0000 |
| commit | 4d45a6de69bc499b21c06deedf80edda06793de0 (patch) | |
| tree | 1b4018847e46e56dd12101f79b850cd3222533d7 /net/tools | |
| parent | c5dbef0ce4b8279cb14ce5516a1f67f6543f5283 (diff) | |
| download | chromium_src-4d45a6de69bc499b21c06deedf80edda06793de0.zip chromium_src-4d45a6de69bc499b21c06deedf80edda06793de0.tar.gz chromium_src-4d45a6de69bc499b21c06deedf80edda06793de0.tar.bz2 | |
Changes for not reading ssl prefs from user_prefs since we have
migrated data from user prefs to local state in M12.
Changes to get ssl preferences from local state in IO thread.
Replaced uses of CreateSystemSSLConfigService with
new net::SSLConfigServiceDefaults so that we could delete
CreateSystemSSLConfigService method.
Deleted ssl_config_service_manager_system.cc
Review URL: http://codereview.chromium.org/6810010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85243 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/fetch/fetch_client.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tools/fetch/fetch_client.cc b/net/tools/fetch/fetch_client.cc index f7717a2..2991ef8 100644 --- a/net/tools/fetch/fetch_client.cc +++ b/net/tools/fetch/fetch_client.cc @@ -16,7 +16,7 @@ #include "net/base/host_resolver.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" -#include "net/base/ssl_config_service.h" +#include "net/base/ssl_config_service_defaults.h" #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_network_layer.h" @@ -145,7 +145,7 @@ int main(int argc, char** argv) { scoped_ptr<net::ProxyService> proxy_service( net::ProxyService::CreateDirect()); scoped_refptr<net::SSLConfigService> ssl_config_service( - net::SSLConfigService::CreateSystemSSLConfigService()); + new net::SSLConfigServiceDefaults); net::HttpTransactionFactory* factory = NULL; scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory( net::HttpAuthHandlerFactory::CreateDefault(host_resolver.get())); |