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 3eb4f467e709d57621f9f7b59853d426c73a8f33..3d0ea0129fac36d3cc283d3fa2b6e5ba53e036ef 100644 |
--- a/content/browser/ssl/ssl_policy_backend.cc |
+++ b/content/browser/ssl/ssl_policy_backend.cc |
@@ -5,44 +5,54 @@ |
#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_(SSLHostState::GetFor(controller->GetBrowserContext())), |
+ : ssl_host_state_delegate_( |
+ controller->GetBrowserContext()->GetSSLHostStateDelegate()), |
controller_(controller) { |
DCHECK(controller_); |
} |
void SSLPolicyBackend::HostRanInsecureContent(const std::string& host, int id) { |
- ssl_host_state_->HostRanInsecureContent(host, id); |
+ if (ssl_host_state_delegate_) |
+ ssl_host_state_delegate_->HostRanInsecureContent(host, id); |
SSLManager::NotifySSLInternalStateChanged(controller_->GetBrowserContext()); |
} |
bool SSLPolicyBackend::DidHostRunInsecureContent(const std::string& host, |
int pid) const { |
- return ssl_host_state_->DidHostRunInsecureContent(host, pid); |
+ if (!ssl_host_state_delegate_) |
+ return false; |
+ |
+ return ssl_host_state_delegate_->DidHostRunInsecureContent(host, pid); |
} |
void SSLPolicyBackend::DenyCertForHost(net::X509Certificate* cert, |
const std::string& host, |
net::CertStatus error) { |
- ssl_host_state_->DenyCertForHost(cert, host, 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) { |
- ssl_host_state_->AllowCertForHost(cert, host, error); |
+ if (ssl_host_state_delegate_) |
+ ssl_host_state_delegate_->AllowCert(host, cert, error); |
} |
net::CertPolicy::Judgment SSLPolicyBackend::QueryPolicy( |
net::X509Certificate* cert, |
const std::string& host, |
net::CertStatus error) { |
- return ssl_host_state_->QueryPolicy(cert, host, error); |
+ if (!ssl_host_state_delegate_) |
+ return net::CertPolicy::UNKNOWN; |
+ |
+ return ssl_host_state_delegate_->QueryPolicy(host, cert, error); |
} |
} // namespace content |