Fix our handling of mixed SSL / non-SSL content....

net/base/x509_certificate.cc

 // Copyright (c) 2006-2008 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 "net/base/x509_certificate.h"
 
 #include "base/histogram.h"
 #include "base/logging.h"
 
 namespace net {
@@ skipping 105 matching lines @@
   denied_.erase(cert->fingerprint());
   allowed_.insert(cert->fingerprint());
 }
 
 void X509Certificate::Policy::Deny(X509Certificate* cert) {
   // Put the cert in the denied set and (maybe) remove it from the allowed set.
   allowed_.erase(cert->fingerprint());
   denied_.insert(cert->fingerprint());
 }
 
+bool X509Certificate::Policy::HasAllowedCert() const {
+  return !allowed_.empty();
+}
+
+bool X509Certificate::Policy::HasDeniedCert() const {
+  return !denied_.empty();
+}
+
 // static
 X509Certificate* X509Certificate::CreateFromHandle(OSCertHandle cert_handle,
                                                    Source source) {
   DCHECK(cert_handle);
   DCHECK(source != SOURCE_UNUSED);
 
   // Check if we already have this certificate in memory.
   X509Certificate::Cache* cache = X509Certificate::Cache::GetInstance();
   X509Certificate* cached_cert =
       cache->Find(CalculateFingerprint(cert_handle));
@@ skipping 50 matching lines @@
 
 #if defined(OS_LINUX)
 // TODO(port): Implement properly on Linux.
 bool X509Certificate::IsEV(int status) const {
   NOTIMPLEMENTED();
   return true;
 }
 #endif
 
 }  // namespace net