diff options
| author | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 19:39:48 +0000 |
|---|---|---|
| committer | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 19:39:48 +0000 |
| commit | f43b89f30c817107bc595f45098d908f84bf9baa (patch) | |
| tree | 9b606ccecd8b30b1f72c52576c2cb034bb6c7244 /net/socket_stream | |
| parent | 9eedb4825fd27cec7086f9be09a08eb8248ca868 (diff) | |
| download | chromium_src-f43b89f30c817107bc595f45098d908f84bf9baa.zip chromium_src-f43b89f30c817107bc595f45098d908f84bf9baa.tar.gz chromium_src-f43b89f30c817107bc595f45098d908f84bf9baa.tar.bz2 | |
Refactor TransportSecurityState.
Do some minor "gcl lint" cleanup while here.
BUG=113280, 120373
TEST=net_unittests, browser_tests, unit_tests TransportSecurityPersisterTest.*
Review URL: http://codereview.chromium.org/9415040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
| -rw-r--r-- | net/socket_stream/socket_stream.cc | 6 | ||||
| -rw-r--r-- | net/socket_stream/socket_stream_job.cc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc index c5a8b2a..51e92907 100644 --- a/net/socket_stream/socket_stream.cc +++ b/net/socket_stream/socket_stream.cc @@ -9,6 +9,7 @@ #include <set> #include <string> +#include <vector> #include "base/bind.h" #include "base/bind_helpers.h" @@ -1205,8 +1206,9 @@ int SocketStream::HandleCertificateError(int result) { const bool fatal = context_->transport_security_state() && context_->transport_security_state()->GetDomainState( - &domain_state, url_.host(), - SSLConfigService::IsSNIAvailable(context_->ssl_config_service())); + url_.host(), + SSLConfigService::IsSNIAvailable(context_->ssl_config_service()), + &domain_state); delegate_->OnSSLCertificateError(this, ssl_info, fatal); return ERR_IO_PENDING; diff --git a/net/socket_stream/socket_stream_job.cc b/net/socket_stream/socket_stream_job.cc index 6672df6..106656e 100644 --- a/net/socket_stream/socket_stream_job.cc +++ b/net/socket_stream/socket_stream_job.cc @@ -28,7 +28,7 @@ SocketStreamJob* SocketStreamJob::CreateSocketStreamJob( GURL socket_url(url); TransportSecurityState::DomainState domain_state; if (url.scheme() == "ws" && sts && sts->GetDomainState( - &domain_state, url.host(), SSLConfigService::IsSNIAvailable(ssl)) && + url.host(), SSLConfigService::IsSNIAvailable(ssl), &domain_state) && domain_state.ShouldRedirectHTTPToHTTPS()) { url_canon::Replacements<char> replacements; static const char kNewScheme[] = "wss"; |