Introduce CertVerifier::RequestParams

net/cert/multi_threaded_cert_verifier_unittest.cc

Index: net/cert/multi_threaded_cert_verifier_unittest.cc
diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc
index 0704a13c3235e961c1750f9bc879ed7e6c7ba375..a93680a3067df08be4ff29c0d61e47b8f86c5106 100644
--- a/net/cert/multi_threaded_cert_verifier_unittest.cc
+++ b/net/cert/multi_threaded_cert_verifier_unittest.cc
@@ -15,6 +15,7 @@
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/cert_trust_anchor_provider.h"
+#include "net/cert/cert_verifier.h"
 #include "net/cert/cert_verify_proc.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/x509_certificate.h"
@@ -271,116 +272,6 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequestThenQuit) {
   // Destroy |verifier| by going out of scope.
 }
 
-TEST_F(MultiThreadedCertVerifierTest, RequestParamsComparators) {
-  SHA1HashValue a_key;
-  memset(a_key.data, 'a', sizeof(a_key.data));
-
-  SHA1HashValue z_key;
-  memset(z_key.data, 'z', sizeof(z_key.data));
-
-  const CertificateList empty_list;
-  CertificateList test_list;
-  test_list.push_back(
-      ImportCertFromFile(GetTestCertsDirectory(), "ok_cert.pem"));
-
-  struct {
-    // Keys to test
-    MultiThreadedCertVerifier::RequestParams key1;
-    MultiThreadedCertVerifier::RequestParams key2;
-
-    // Expectation:
-    // -1 means key1 is less than key2
-    //  0 means key1 equals key2
-    //  1 means key1 is greater than key2
-    int expected_result;
-  } tests[] = {
-      {
-       // Test for basic equivalence.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       0,
-      },
-      {
-       // Test that different certificates but with the same CA and for
-       // the same host are different validation keys.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           z_key, a_key, "www.example.test", std::string(), 0, test_list),
-       -1,
-      },
-      {
-       // Test that the same EE certificate for the same host, but with
-       // different chains are different validation keys.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, z_key, "www.example.test", std::string(), 0, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       1,
-      },
-      {
-       // The same certificate, with the same chain, but for different
-       // hosts are different validation keys.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www1.example.test", std::string(), 0, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www2.example.test", std::string(), 0, test_list),
-       -1,
-      },
-      {
-       // The same certificate, chain, and host, but with different flags
-       // are different validation keys.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(),
-           CertVerifier::VERIFY_EV_CERT, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       1,
-      },
-      {
-       // Different additional_trust_anchors.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, empty_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       -1,
-      },
-      {
-       // Different OCSP responses.
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", "ocsp response", 0, test_list),
-       MultiThreadedCertVerifier::RequestParams(
-           a_key, a_key, "www.example.test", std::string(), 0, test_list),
-       -1,
-      },
-  };
-  for (size_t i = 0; i < arraysize(tests); ++i) {
-    SCOPED_TRACE(base::StringPrintf("Test[%" PRIuS "]", i));
-
-    const MultiThreadedCertVerifier::RequestParams& key1 = tests[i].key1;
-    const MultiThreadedCertVerifier::RequestParams& key2 = tests[i].key2;
-
-    switch (tests[i].expected_result) {
-      case -1:
-        EXPECT_TRUE(key1 < key2);
-        EXPECT_FALSE(key2 < key1);
-        break;
-      case 0:
-        EXPECT_FALSE(key1 < key2);
-        EXPECT_FALSE(key2 < key1);
-        break;
-      case 1:
-        EXPECT_FALSE(key1 < key2);
-        EXPECT_TRUE(key2 < key1);
-        break;
-      default:
-        FAIL() << "Invalid expectation. Can be only -1, 0, 1";
-    }
-  }
-}
-
 TEST_F(MultiThreadedCertVerifierTest, CertTrustAnchorProvider) {
   MockCertTrustAnchorProvider trust_provider;
   verifier_.SetCertTrustAnchorProvider(&trust_provider);