| Index: content/browser/ssl/ssl_policy_backend.cc
|
| diff --git a/content/browser/ssl/ssl_policy_backend.cc b/content/browser/ssl/ssl_policy_backend.cc
|
| index e81c35d1628108c46477c5242d8cb61da1ff5efd..4031f88aa403e5d8a1424a3a3f06f59a65c20ef9 100644
|
| --- a/content/browser/ssl/ssl_policy_backend.cc
|
| +++ b/content/browser/ssl/ssl_policy_backend.cc
|
| @@ -31,13 +31,6 @@ bool SSLPolicyBackend::DidHostRunInsecureContent(const std::string& host,
|
| return ssl_host_state_delegate_->DidHostRunInsecureContent(host, pid);
|
| }
|
|
|
| -void SSLPolicyBackend::DenyCertForHost(net::X509Certificate* cert,
|
| - const std::string& host,
|
| - net::CertStatus error) {
|
| - if (ssl_host_state_delegate_)
|
| - ssl_host_state_delegate_->DenyCert(host, cert, error);
|
| -}
|
| -
|
| void SSLPolicyBackend::AllowCertForHost(net::X509Certificate* cert,
|
| const std::string& host,
|
| net::CertStatus error) {
|
| @@ -45,16 +38,15 @@ void SSLPolicyBackend::AllowCertForHost(net::X509Certificate* cert,
|
| ssl_host_state_delegate_->AllowCert(host, cert, error);
|
| }
|
|
|
| -net::CertPolicy::Judgment SSLPolicyBackend::QueryPolicy(
|
| +SSLHostStateDelegate::CertJudgment SSLPolicyBackend::QueryPolicy(
|
| net::X509Certificate* cert,
|
| const std::string& host,
|
| net::CertStatus error,
|
| bool* expired_previous_decision) {
|
| - if (!ssl_host_state_delegate_)
|
| - return net::CertPolicy::UNKNOWN;
|
| -
|
| - return ssl_host_state_delegate_->QueryPolicy(
|
| - host, cert, error, expired_previous_decision);
|
| + return ssl_host_state_delegate_ ?
|
| + ssl_host_state_delegate_->QueryPolicy(
|
| + host, cert, error, expired_previous_decision) :
|
| + SSLHostStateDelegate::DENIED;
|
| }
|
|
|
| } // namespace content
|
|
|