Remove DenyCertForHost from SSLHostStateDelegate API.

net/cert/x509_certificate_unittest.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 "net/cert/x509_certificate.h"
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/pickle.h"
@@ skipping 599 matching lines @@
       cert->GetIntermediateCertificates();
   const X509Certificate::OSCertHandles& pickle_intermediates =
       cert_from_pickle->GetIntermediateCertificates();
   ASSERT_EQ(cert_intermediates.size(), pickle_intermediates.size());
   for (size_t i = 0; i < cert_intermediates.size(); ++i) {
     EXPECT_TRUE(X509Certificate::IsSameOSCert(cert_intermediates[i],
                                               pickle_intermediates[i]));
   }
 }
 
-TEST(X509CertificateTest, Policy) {
-  scoped_refptr<X509Certificate> google_cert(X509Certificate::CreateFromBytes(
-      reinterpret_cast<const char*>(google_der), sizeof(google_der)));
-
-  scoped_refptr<X509Certificate> webkit_cert(X509Certificate::CreateFromBytes(
-      reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der)));
-
-  CertPolicy policy;
-
-  // To begin with, everything should be unknown.
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(google_cert.get(), CERT_STATUS_DATE_INVALID));
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_FALSE(policy.HasAllowedCert());
-  EXPECT_FALSE(policy.HasDeniedCert());
-
-  // Test adding one certificate with one error.
-  policy.Allow(google_cert.get(), CERT_STATUS_DATE_INVALID);
-  EXPECT_EQ(CertPolicy::ALLOWED,
-            policy.Check(google_cert.get(), CERT_STATUS_DATE_INVALID));
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(google_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(google_cert.get(),
-                CERT_STATUS_DATE_INVALID | CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_TRUE(policy.HasAllowedCert());
-  EXPECT_FALSE(policy.HasDeniedCert());
-
-  // Test saving the same certificate with a new error.
-  policy.Allow(google_cert.get(), CERT_STATUS_AUTHORITY_INVALID);
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(google_cert.get(), CERT_STATUS_DATE_INVALID));
-  EXPECT_EQ(CertPolicy::ALLOWED,
-            policy.Check(google_cert.get(), CERT_STATUS_AUTHORITY_INVALID));
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_TRUE(policy.HasAllowedCert());
-  EXPECT_FALSE(policy.HasDeniedCert());
-
-  // Test adding one certificate with two errors.
-  policy.Allow(google_cert.get(),
-               CERT_STATUS_DATE_INVALID | CERT_STATUS_AUTHORITY_INVALID);
-  EXPECT_EQ(CertPolicy::ALLOWED,
-            policy.Check(google_cert.get(), CERT_STATUS_DATE_INVALID));
-  EXPECT_EQ(CertPolicy::ALLOWED,
-            policy.Check(google_cert.get(), CERT_STATUS_AUTHORITY_INVALID));
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(google_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_TRUE(policy.HasAllowedCert());
-  EXPECT_FALSE(policy.HasDeniedCert());
-
-  // Test removing a certificate that was previously allowed.
-  policy.Deny(google_cert.get(), CERT_STATUS_DATE_INVALID);
-  EXPECT_EQ(CertPolicy::DENIED,
-            policy.Check(google_cert.get(), CERT_STATUS_DATE_INVALID));
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_FALSE(policy.HasAllowedCert());
-  EXPECT_TRUE(policy.HasDeniedCert());
-
-  // Test removing a certificate that was previously unknown.
-  policy.Deny(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID);
-  EXPECT_EQ(CertPolicy::DENIED,
-            policy.Check(google_cert.get(), CERT_STATUS_DATE_INVALID));
-  EXPECT_EQ(CertPolicy::DENIED,
-            policy.Check(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_FALSE(policy.HasAllowedCert());
-  EXPECT_TRUE(policy.HasDeniedCert());
-
-  // Test saving a certificate that was previously denied.
-  policy.Allow(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID);
-  EXPECT_EQ(CertPolicy::DENIED,
-            policy.Check(google_cert.get(), CERT_STATUS_DATE_INVALID));
-  EXPECT_EQ(CertPolicy::ALLOWED,
-            policy.Check(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_TRUE(policy.HasAllowedCert());
-  EXPECT_TRUE(policy.HasDeniedCert());
-
-  // Test denying an overlapping certificate.
-  policy.Allow(google_cert.get(),
-               CERT_STATUS_COMMON_NAME_INVALID | CERT_STATUS_DATE_INVALID);
-  policy.Deny(google_cert.get(), CERT_STATUS_DATE_INVALID);
-  EXPECT_EQ(CertPolicy::DENIED,
-            policy.Check(google_cert.get(), CERT_STATUS_DATE_INVALID));
-  EXPECT_EQ(CertPolicy::UNKNOWN,
-            policy.Check(google_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_EQ(CertPolicy::DENIED,
-            policy.Check(google_cert.get(),
-                CERT_STATUS_COMMON_NAME_INVALID | CERT_STATUS_DATE_INVALID));
-
-  // Test denying an overlapping certificate (other direction).
-  policy.Allow(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID);
-  policy.Deny(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID);
-  policy.Deny(webkit_cert.get(), CERT_STATUS_DATE_INVALID);
-  EXPECT_EQ(CertPolicy::DENIED,
-            policy.Check(webkit_cert.get(), CERT_STATUS_COMMON_NAME_INVALID));
-  EXPECT_EQ(CertPolicy::DENIED,
-            policy.Check(webkit_cert.get(), CERT_STATUS_DATE_INVALID));
-}
-
 TEST(X509CertificateTest, IntermediateCertificates) {
   scoped_refptr<X509Certificate> webkit_cert(
       X509Certificate::CreateFromBytes(
           reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der)));
 
   scoped_refptr<X509Certificate> thawte_cert(
       X509Certificate::CreateFromBytes(
           reinterpret_cast<const char*>(thawte_der), sizeof(thawte_der)));
 
   X509Certificate::OSCertHandle google_handle;
@@ skipping 532 matching lines @@
                                     &actual_type);
 
   EXPECT_EQ(data.expected_bits, actual_bits);
   EXPECT_EQ(data.expected_type, actual_type);
 }
 
 INSTANTIATE_TEST_CASE_P(, X509CertificatePublicKeyInfoTest,
                         testing::ValuesIn(kPublicKeyInfoTestData));
 
 }  // namespace net