Revert of Disable CTPolicyEnforcerTest.ConformsToCTEVPolicyIfSCTBeforeEnforcementDate

net/cert/ct_policy_enforcer_unittest.cc

 // Copyright 2014 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/ct_policy_enforcer.h"
 
 #include <memory>
 #include <string>
 
 #include "base/time/time.h"
@@ skipping 153 matching lines @@
       desired_log_ids.size(), desired_log_ids, true, &scts);
 
   EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_NOT_DIVERSE_SCTS,
             policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts,
                                                       NetLogWithSource()));
   EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_NOT_DIVERSE_SCTS,
             policy_enforcer_->DoesConformToCTEVPolicy(
                 chain_.get(), nullptr, scts, NetLogWithSource()));
 }
 
-#if defined(OS_ANDROID)
-#define MAYBE_ConformsToCTEVPolicyIfSCTBeforeEnforcementDate
-DISABLED_ConformsToCTEVPolicyIfSCTBeforeEnforcementDate
-#else
-#define MAYBE_ConformsToCTEVPolicyIfSCTBeforeEnforcementDate \
-  ConformsToCTEVPolicyIfSCTBeforeEnforcementDate
-#endif
-TEST_F(CTPolicyEnforcerTest,
-       MAYBE_ConformsToCTEVPolicyIfSCTBeforeEnforcementDate) {
+TEST_F(CTPolicyEnforcerTest, ConformsToCTEVPolicyIfSCTBeforeEnforcementDate) {
   ct::SCTList scts;
   // |chain_| is valid for 10 years - over 121 months - so requires 5 SCTs.
   // All 5 SCTs will be from non-Google logs.
   FillListWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 5,
                            std::vector<std::string>(), false, &scts);
 
   EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS,
             policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts,
                                                       NetLogWithSource()));
   EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_COMPLIES_VIA_SCTS,
@@ skipping 377 matching lines @@
   FillListWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 2,
                            &scts);
   EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_NOT_ENOUGH_SCTS,
             policy_enforcer_->DoesConformToCTEVPolicy(
                 chain_.get(), nullptr, scts, NetLogWithSource()));
 }
 
 }  // namespace
 
 }  // namespace net