| Index: net/cert/ct_policy_enforcer_unittest.cc
|
| diff --git a/net/cert/ct_policy_enforcer_unittest.cc b/net/cert/ct_policy_enforcer_unittest.cc
|
| index 435525293337ea7569e52ccf35e881580b1123b1..78c797986cd26826a3d161cdd0863b5a794163a7 100644
|
| --- a/net/cert/ct_policy_enforcer_unittest.cc
|
| +++ b/net/cert/ct_policy_enforcer_unittest.cc
|
| @@ -123,15 +123,15 @@ class CTPolicyEnforcerTest : public ::testing::Test {
|
| for (size_t i = 0; i < required_scts - 1; ++i) {
|
| FillResultWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED,
|
| 1, std::vector<std::string>(), false, &result);
|
| - EXPECT_FALSE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| + EXPECT_FALSE(policy_enforcer_->DoesConformToCTPolicy(
|
| cert.get(), nullptr, result, BoundNetLog()))
|
| << " for: " << (end - start).InDays() << " and " << required_scts
|
| << " scts=" << result.verified_scts.size() << " i=" << i;
|
| }
|
| FillResultWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 1,
|
| std::vector<std::string>(), false, &result);
|
| - EXPECT_TRUE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| - cert.get(), nullptr, result, BoundNetLog()))
|
| + EXPECT_TRUE(policy_enforcer_->DoesConformToCTPolicy(cert.get(), nullptr,
|
| + result, BoundNetLog()))
|
| << " for: " << (end - start).InDays() << " and " << required_scts
|
| << " scts=" << result.verified_scts.size();
|
| }
|
| @@ -148,8 +148,8 @@ TEST_F(CTPolicyEnforcerTest,
|
| ct::CTVerifyResult result;
|
| FillResultWithRepeatedLogID(google_log_id_, 2, true, &result);
|
|
|
| - EXPECT_FALSE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| - chain_.get(), nullptr, result, BoundNetLog()));
|
| + EXPECT_FALSE(policy_enforcer_->DoesConformToCTPolicy(chain_.get(), nullptr,
|
| + result, BoundNetLog()));
|
| }
|
|
|
| TEST_F(CTPolicyEnforcerTest,
|
| @@ -157,16 +157,16 @@ TEST_F(CTPolicyEnforcerTest,
|
| ct::CTVerifyResult result;
|
| FillResultWithRepeatedLogID(non_google_log_id_, 2, true, &result);
|
|
|
| - EXPECT_FALSE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| - chain_.get(), nullptr, result, BoundNetLog()));
|
| + EXPECT_FALSE(policy_enforcer_->DoesConformToCTPolicy(chain_.get(), nullptr,
|
| + result, BoundNetLog()));
|
| }
|
|
|
| TEST_F(CTPolicyEnforcerTest, ConformsToCTEVPolicyIfSCTBeforeEnforcementDate) {
|
| ct::CTVerifyResult result;
|
| FillResultWithRepeatedLogID(non_google_log_id_, 2, false, &result);
|
|
|
| - EXPECT_TRUE(policy_enforcer_->DoesConformToCTEVPolicy(chain_.get(), nullptr,
|
| - result, BoundNetLog()));
|
| + EXPECT_TRUE(policy_enforcer_->DoesConformToCTPolicy(chain_.get(), nullptr,
|
| + result, BoundNetLog()));
|
| }
|
|
|
| TEST_F(CTPolicyEnforcerTest, ConformsToCTEVPolicyWithNonEmbeddedSCTs) {
|
| @@ -174,8 +174,8 @@ TEST_F(CTPolicyEnforcerTest, ConformsToCTEVPolicyWithNonEmbeddedSCTs) {
|
| FillResultWithSCTsOfOrigin(
|
| ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION, 2, &result);
|
|
|
| - EXPECT_TRUE(policy_enforcer_->DoesConformToCTEVPolicy(chain_.get(), nullptr,
|
| - result, BoundNetLog()));
|
| + EXPECT_TRUE(policy_enforcer_->DoesConformToCTPolicy(chain_.get(), nullptr,
|
| + result, BoundNetLog()));
|
| }
|
|
|
| TEST_F(CTPolicyEnforcerTest, ConformsToCTEVPolicyWithEmbeddedSCTs) {
|
| @@ -184,8 +184,8 @@ TEST_F(CTPolicyEnforcerTest, ConformsToCTEVPolicyWithEmbeddedSCTs) {
|
| FillResultWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 5,
|
| &result);
|
|
|
| - EXPECT_TRUE(policy_enforcer_->DoesConformToCTEVPolicy(chain_.get(), nullptr,
|
| - result, BoundNetLog()));
|
| + EXPECT_TRUE(policy_enforcer_->DoesConformToCTPolicy(chain_.get(), nullptr,
|
| + result, BoundNetLog()));
|
| }
|
|
|
| TEST_F(CTPolicyEnforcerTest, DoesNotConformToCTEVPolicyNotEnoughSCTs) {
|
| @@ -198,13 +198,13 @@ TEST_F(CTPolicyEnforcerTest, DoesNotConformToCTEVPolicyNotEnoughSCTs) {
|
| FillResultWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 1,
|
| &result);
|
|
|
| - EXPECT_FALSE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| + EXPECT_FALSE(policy_enforcer_->DoesConformToCTPolicy(
|
| chain_.get(), non_including_whitelist.get(), result, BoundNetLog()));
|
|
|
| // ... but should be OK if whitelisted.
|
| scoped_refptr<ct::EVCertsWhitelist> whitelist(
|
| new DummyEVCertsWhitelist(true, true));
|
| - EXPECT_TRUE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| + EXPECT_TRUE(policy_enforcer_->DoesConformToCTPolicy(
|
| chain_.get(), whitelist.get(), result, BoundNetLog()));
|
| }
|
|
|
| @@ -214,12 +214,12 @@ TEST_F(CTPolicyEnforcerTest, DoesNotConformToPolicyInvalidDates) {
|
| ct::CTVerifyResult result;
|
| FillResultWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 5,
|
| &result);
|
| - EXPECT_FALSE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| + EXPECT_FALSE(policy_enforcer_->DoesConformToCTPolicy(
|
| no_valid_dates_cert.get(), nullptr, result, BoundNetLog()));
|
| // ... but should be OK if whitelisted.
|
| scoped_refptr<ct::EVCertsWhitelist> whitelist(
|
| new DummyEVCertsWhitelist(true, true));
|
| - EXPECT_TRUE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| + EXPECT_TRUE(policy_enforcer_->DoesConformToCTPolicy(
|
| chain_.get(), whitelist.get(), result, BoundNetLog()));
|
| }
|
|
|
| @@ -274,7 +274,7 @@ TEST_F(CTPolicyEnforcerTest, ConformsToPolicyByEVWhitelistPresence) {
|
| ct::CTVerifyResult result;
|
| FillResultWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 1,
|
| &result);
|
| - EXPECT_TRUE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| + EXPECT_TRUE(policy_enforcer_->DoesConformToCTPolicy(
|
| chain_.get(), whitelist.get(), result, BoundNetLog()));
|
| }
|
|
|
| @@ -285,7 +285,7 @@ TEST_F(CTPolicyEnforcerTest, IgnoresInvalidEVWhitelist) {
|
| ct::CTVerifyResult result;
|
| FillResultWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 1,
|
| &result);
|
| - EXPECT_FALSE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| + EXPECT_FALSE(policy_enforcer_->DoesConformToCTPolicy(
|
| chain_.get(), whitelist.get(), result, BoundNetLog()));
|
| }
|
|
|
| @@ -293,8 +293,8 @@ TEST_F(CTPolicyEnforcerTest, IgnoresNullEVWhitelist) {
|
| ct::CTVerifyResult result;
|
| FillResultWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 1,
|
| &result);
|
| - EXPECT_FALSE(policy_enforcer_->DoesConformToCTEVPolicy(
|
| - chain_.get(), nullptr, result, BoundNetLog()));
|
| + EXPECT_FALSE(policy_enforcer_->DoesConformToCTPolicy(chain_.get(), nullptr,
|
| + result, BoundNetLog()));
|
| }
|
|
|
| } // namespace
|
|
|