Revert of Add policies support to VerifyCertificateChain().

net/cert/internal/verify_certificate_chain_pkits_unittest.cc

Index: net/cert/internal/verify_certificate_chain_pkits_unittest.cc
diff --git a/net/cert/internal/verify_certificate_chain_pkits_unittest.cc b/net/cert/internal/verify_certificate_chain_pkits_unittest.cc
index f86e1e9ec40aba0ab2032f7237d4872564c386c6..8138dae90b86005a2a533fcaf48e553bfe14fd7e 100644
--- a/net/cert/internal/verify_certificate_chain_pkits_unittest.cc
+++ b/net/cert/internal/verify_certificate_chain_pkits_unittest.cc
@@ -67,18 +67,11 @@
 
     SimpleSignaturePolicy signature_policy(1024);
 
-    std::set<der::Input> user_constrained_policy_set;
-
     CertPathErrors path_errors;
-    VerifyCertificateChain(
-        input_chain, CertificateTrust::ForTrustAnchor(), &signature_policy,
-        info.time, KeyPurpose::ANY_EKU, info.initial_explicit_policy,
-        info.initial_policy_set, info.initial_policy_mapping_inhibit,
-        info.initial_inhibit_any_policy, &user_constrained_policy_set,
-        &path_errors);
+    VerifyCertificateChain(input_chain, CertificateTrust::ForTrustAnchor(),
+                           &signature_policy, info.time, KeyPurpose::ANY_EKU,
+                           &path_errors);
     bool did_succeed = !path_errors.ContainsHighSeverityErrors();
-
-    EXPECT_EQ(info.user_constrained_policy_set, user_constrained_policy_set);
 
     //  TODO(crbug.com/634443): Test errors on failure?
     if (info.should_validate != did_succeed) {
@@ -229,21 +222,6 @@
                               PkitsTest07KeyUsage,
                               VerifyCertificateChainPkitsTestDelegate);
 INSTANTIATE_TYPED_TEST_CASE_P(VerifyCertificateChain,
-                              PkitsTest08CertificatePolicies,
-                              VerifyCertificateChainPkitsTestDelegate);
-INSTANTIATE_TYPED_TEST_CASE_P(VerifyCertificateChain,
-                              PkitsTest09RequireExplicitPolicy,
-                              VerifyCertificateChainPkitsTestDelegate);
-INSTANTIATE_TYPED_TEST_CASE_P(VerifyCertificateChain,
-                              PkitsTest10PolicyMappings,
-                              VerifyCertificateChainPkitsTestDelegate);
-INSTANTIATE_TYPED_TEST_CASE_P(VerifyCertificateChain,
-                              PkitsTest11InhibitPolicyMapping,
-                              VerifyCertificateChainPkitsTestDelegate);
-INSTANTIATE_TYPED_TEST_CASE_P(VerifyCertificateChain,
-                              PkitsTest12InhibitAnyPolicy,
-                              VerifyCertificateChainPkitsTestDelegate);
-INSTANTIATE_TYPED_TEST_CASE_P(VerifyCertificateChain,
                               PkitsTest13NameConstraints,
                               VerifyCertificateChainPkitsTestDelegate);
 INSTANTIATE_TYPED_TEST_CASE_P(VerifyCertificateChain,
@@ -254,4 +232,8 @@
 // PkitsTest05VerifyingPathswithSelfIssuedCertificates,
 // PkitsTest14DistributionPoints, PkitsTest15DeltaCRLs
 
+// TODO(mattm): Certificate Policies support: PkitsTest08CertificatePolicies,
+// PkitsTest09RequireExplicitPolicy PkitsTest10PolicyMappings,
+// PkitsTest11InhibitPolicyMapping, PkitsTest12InhibitAnyPolicy
+
 }  // namespace net