Remove DenyCertForHost from SSLHostStateDelegate API.

content/browser/ssl/ssl_policy_backend.cc

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..b776fd3c417c596934d139f1855a6619435defdb 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) {
@@ -53,8 +46,13 @@ net::CertPolicy::Judgment SSLPolicyBackend::QueryPolicy(
   if (!ssl_host_state_delegate_)

[Peter Kasting, 2014/08/22 00:57:53]

Nit: This whole function could just be:

  return ssl_host_state_delegate_ ?
      ssl_host_state_delegate_->QueryPolicy(host, cert, error,
                                            expired_previous_decision) :
      net::CertPolicy::UNKNOWN;

I don't think the DCHECK is really worth the extra verbiage.

[jww, 2014/08/22 03:49:35]

Done.

     return net::CertPolicy::UNKNOWN;
 
-  return ssl_host_state_delegate_->QueryPolicy(
+  net::CertPolicy::Judgment judgement = ssl_host_state_delegate_->QueryPolicy(
       host, cert, error, expired_previous_decision);
+  // SSLHostStateDelegate guarantees that it will only return ALLOWED or UNKNOWN
+  // and this method promises the same so check that before returning.
+  DCHECK(judgement == net::CertPolicy::ALLOWED ||
+         judgement == net::CertPolicy::UNKNOWN);
+  return judgement;
 }
 
 }  // namespace content