diff options
author | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 06:48:11 +0000 |
---|---|---|
committer | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-13 06:48:11 +0000 |
commit | b1c988bcd7869765e1bd56e592787af123340516 (patch) | |
tree | 3aafa3d0ddd90d90e059c0a38dd2d7a465fc81c1 /net/proxy | |
parent | 9dcdbbef52460de45070d815eb1ad735d120ae07 (diff) | |
download | chromium_src-b1c988bcd7869765e1bd56e592787af123340516.zip chromium_src-b1c988bcd7869765e1bd56e592787af123340516.tar.gz chromium_src-b1c988bcd7869765e1bd56e592787af123340516.tar.bz2 |
Give more request types a TransportSecurityState.
DCHECK on NULL TransportSecurityState, as a precursor to a real CHECK. It
should be an error to try to connect with an SSL client socket without
having a live TSS.
BUG=246724
Review URL: https://chromiumcodereview.appspot.com/16501002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
-rw-r--r-- | net/proxy/proxy_script_fetcher_impl_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl_unittest.cc b/net/proxy/proxy_script_fetcher_impl_unittest.cc index b4f1f7a..1c89b3c 100644 --- a/net/proxy/proxy_script_fetcher_impl_unittest.cc +++ b/net/proxy/proxy_script_fetcher_impl_unittest.cc @@ -19,6 +19,7 @@ #include "net/http/http_cache.h" #include "net/http/http_network_session.h" #include "net/http/http_server_properties_impl.h" +#include "net/http/transport_security_state.h" #include "net/ssl/ssl_config_service_defaults.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "net/url_request/file_protocol_handler.h" @@ -52,6 +53,7 @@ class RequestContext : public URLRequestContext { ProxyConfig no_proxy; storage_.set_host_resolver(scoped_ptr<HostResolver>(new MockHostResolver)); storage_.set_cert_verifier(new MockCertVerifier); + storage_.set_transport_security_state(new TransportSecurityState); storage_.set_proxy_service(ProxyService::CreateFixed(no_proxy)); storage_.set_ssl_config_service(new SSLConfigServiceDefaults); storage_.set_http_server_properties(new HttpServerPropertiesImpl); @@ -59,6 +61,7 @@ class RequestContext : public URLRequestContext { HttpNetworkSession::Params params; params.host_resolver = host_resolver(); params.cert_verifier = cert_verifier(); + params.transport_security_state = transport_security_state(); params.proxy_service = proxy_service(); params.ssl_config_service = ssl_config_service(); params.http_server_properties = http_server_properties(); |