diff options
Diffstat (limited to 'content/browser/ssl/ssl_policy_backend.cc')
-rw-r--r-- | content/browser/ssl/ssl_policy_backend.cc | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/content/browser/ssl/ssl_policy_backend.cc b/content/browser/ssl/ssl_policy_backend.cc index 3d0ea01..3eb4f46 100644 --- a/content/browser/ssl/ssl_policy_backend.cc +++ b/content/browser/ssl/ssl_policy_backend.cc @@ -5,54 +5,44 @@ #include "content/browser/ssl/ssl_policy_backend.h" #include "content/browser/frame_host/navigation_controller_impl.h" +#include "content/browser/ssl/ssl_host_state.h" #include "content/public/browser/browser_context.h" -#include "content/public/browser/ssl_host_state_delegate.h" namespace content { SSLPolicyBackend::SSLPolicyBackend(NavigationControllerImpl* controller) - : ssl_host_state_delegate_( - controller->GetBrowserContext()->GetSSLHostStateDelegate()), + : ssl_host_state_(SSLHostState::GetFor(controller->GetBrowserContext())), controller_(controller) { DCHECK(controller_); } void SSLPolicyBackend::HostRanInsecureContent(const std::string& host, int id) { - if (ssl_host_state_delegate_) - ssl_host_state_delegate_->HostRanInsecureContent(host, id); + ssl_host_state_->HostRanInsecureContent(host, id); SSLManager::NotifySSLInternalStateChanged(controller_->GetBrowserContext()); } bool SSLPolicyBackend::DidHostRunInsecureContent(const std::string& host, int pid) const { - if (!ssl_host_state_delegate_) - return false; - - return ssl_host_state_delegate_->DidHostRunInsecureContent(host, pid); + return ssl_host_state_->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); + ssl_host_state_->DenyCertForHost(cert, host, error); } void SSLPolicyBackend::AllowCertForHost(net::X509Certificate* cert, const std::string& host, net::CertStatus error) { - if (ssl_host_state_delegate_) - ssl_host_state_delegate_->AllowCert(host, cert, error); + ssl_host_state_->AllowCertForHost(cert, host, error); } net::CertPolicy::Judgment SSLPolicyBackend::QueryPolicy( net::X509Certificate* cert, const std::string& host, net::CertStatus error) { - if (!ssl_host_state_delegate_) - return net::CertPolicy::UNKNOWN; - - return ssl_host_state_delegate_->QueryPolicy(host, cert, error); + return ssl_host_state_->QueryPolicy(cert, host, error); } } // namespace content |