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/url_request | |
| 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/url_request')
| -rw-r--r-- | net/url_request/url_request_test_util.cc | 4 | ||||
| -rw-r--r-- | net/url_request/url_request_unittest.cc | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc index 95964fe..68b3404 100644 --- a/net/url_request/url_request_test_util.cc +++ b/net/url_request/url_request_test_util.cc @@ -14,6 +14,7 @@ #include "net/dns/mock_host_resolver.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/default_server_bound_cert_store.h" #include "net/ssl/server_bound_cert_service.h" #include "net/url_request/static_http_user_agent_settings.h" @@ -72,6 +73,8 @@ void TestURLRequestContext::Init() { context_storage_.set_proxy_service(ProxyService::CreateDirect()); if (!cert_verifier()) context_storage_.set_cert_verifier(CertVerifier::CreateDefault()); + if (!transport_security_state()) + context_storage_.set_transport_security_state(new TransportSecurityState); if (!ssl_config_service()) context_storage_.set_ssl_config_service(new SSLConfigServiceDefaults); if (!http_auth_handler_factory()) { @@ -94,6 +97,7 @@ void TestURLRequestContext::Init() { params.client_socket_factory = client_socket_factory(); 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_auth_handler_factory = http_auth_handler_factory(); diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index a22423d..aae296f 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -5093,6 +5093,7 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) { HttpNetworkSession::Params params; params.host_resolver = default_context_.host_resolver(); params.cert_verifier = default_context_.cert_verifier(); + params.transport_security_state = default_context_.transport_security_state(); params.proxy_service = default_context_.proxy_service(); params.ssl_config_service = default_context_.ssl_config_service(); params.http_auth_handler_factory = |