Remove DenyCertForHost from SSLHostStateDelegate API.

content/browser/ssl/ssl_policy_backend.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/ssl/ssl_policy_backend.h"
 
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/ssl_host_state_delegate.h"
 
@@ skipping 13 matching lines @@
 }
 
 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);
 }
 
-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) {
   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,
     bool* expired_previous_decision) {
   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