Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / ssl / ssl_policy_backend.cc

diff --git a/src/content/browser/ssl/ssl_policy_backend.cc b/src/content/browser/ssl/ssl_policy_backend.cc
index e81c35d..5c65874 100644 (file)
--- a/src/content/browser/ssl/ssl_policy_backend.cc
+++ b/src/content/browser/ssl/ssl_policy_backend.cc
@@ -31,30 +31,22 @@ 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,
+void SSLPolicyBackend::AllowCertForHost(const net::X509Certificate& cert,
                                         const std::string& host,
                                         net::CertStatus error) {
   if (ssl_host_state_delegate_)
     ssl_host_state_delegate_->AllowCert(host, cert, error);
 }
 
-net::CertPolicy::Judgment SSLPolicyBackend::QueryPolicy(
-    net::X509Certificate* cert,
+SSLHostStateDelegate::CertJudgment SSLPolicyBackend::QueryPolicy(
+    const 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