Revert of Mark the Certly.io log as disqualified, as of April 15 2016

Revert of Mark the Certly.io log as disqualified, as of April 15 2016 (patchset #6 id:90001 of https://codereview.chromium.org/1941273002/ )

Reason for revert:
This seems to be the most likely cause of this CertVerifyProcTest failure:
https://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20(dbg)/builds/34273

Original issue's description:
> Mark the Certly.io log as disqualified, as of April 15 2016
>
> BUG=none
>
> Committed: https://crrev.com/4db616c441f693e7eca3c7f5f7452fdfd4b84eb2
> Cr-Commit-Position: refs/heads/master@{#392444}

TBR=eroman@chromium.org,eranm@chromium.org,rsleevi@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

Committed: https://crrev.com/4036d8cfb59821cd3411004851e934a3b3293dfc
Cr-Commit-Position: refs/heads/master@{#392502}

[paulmiller, 2016-05-10 00:51:01]

Created Revert of Mark the Certly.io log as disqualified, as of April 15 2016

[commit-bot: I haz the power, 2016-05-10 00:51:25]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1956273003/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1956273003/1

[commit-bot: I haz the power, 2016-05-10 00:53:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-05-10 00:53:23]

Failed to apply patch for net/cert/ct_policy_enforcer_unittest.cc:
While running git apply --index -3 -p1;
  error: patch failed: net/cert/ct_policy_enforcer_unittest.cc:322
  Falling back to three-way merge...
  Applied patch to 'net/cert/ct_policy_enforcer_unittest.cc' with conflicts.
  U net/cert/ct_policy_enforcer_unittest.cc

Patch:       net/cert/ct_policy_enforcer_unittest.cc
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
28a47511f657bfd8e1054e8378cb2149ae6cd35c..9692b94fef36ab59c8d028588a635dcf833e7b0f
100644
--- a/net/cert/ct_policy_enforcer_unittest.cc
+++ b/net/cert/ct_policy_enforcer_unittest.cc
@@ -81,40 +81,15 @@
       else
         sct->log_id = std::string(crypto::kSHA256Length, static_cast<char>(i));
 
-      if (timestamp_past_enforcement_date) {
+      if (timestamp_past_enforcement_date)
         sct->timestamp =
             base::Time::FromUTCExploded({2015, 8, 0, 15, 0, 0, 0, 0});
-      } else {
+      else
         sct->timestamp =
             base::Time::FromUTCExploded({2015, 6, 0, 15, 0, 0, 0, 0});
-      }
 
       verified_scts->push_back(sct);
     }
-  }
-
-  void AddDisqualifiedLogSCT(
-      ct::SignedCertificateTimestamp::Origin desired_origin,
-      bool timestamp_after_disqualification_date,
-      ct::SCTList* verified_scts) {
-    static const char kCertlyLogID[] =
-        "\xcd\xb5\x17\x9b\x7f\xc1\xc0\x46\xfe\xea\x31\x13\x6a\x3f\x8f\x00\x2e"
-        "\x61\x82\xfa\xf8\x89\x6f\xec\xc8\xb2\xf5\xb5\xab\x60\x49\x00";
-    static_assert(arraysize(kCertlyLogID) - 1 == crypto::kSHA256Length,
-                  "Incorrect log ID length.");
-
-    scoped_refptr<ct::SignedCertificateTimestamp> sct(
-        new ct::SignedCertificateTimestamp());
-    sct->origin = desired_origin;
-    sct->log_id = std::string(kCertlyLogID, crypto::kSHA256Length);
-    if (timestamp_after_disqualification_date) {
-      sct->timestamp =
-          base::Time::FromUTCExploded({2016, 4, 0, 16, 0, 0, 0, 0});
-    } else {
-      sct->timestamp = base::Time::FromUTCExploded({2016, 4, 0, 1, 0, 0, 0,
0});
-    }
-
-    verified_scts->push_back(sct);
   }
 
   void FillListWithSCTsOfOrigin(
@@ -322,119 +297,6 @@
                 chain_.get(), whitelist.get(), scts, BoundNetLog()));
 }
 
-TEST_F(CTPolicyEnforcerTest, DoesNotConformToCTEVPolicyNotEnoughFreshSCTs) {
-  ct::SCTList scts;
-
-  // The results should be the same before and after disqualification,
-  // regardless of the delivery method.
-
-  // SCT from before disqualification.
-  scts.clear();
-  FillListWithSCTsOfOrigin(
-      ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION, 1, &scts);
-  AddDisqualifiedLogSCT(ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION,
-                        false, &scts);
-  EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_NOT_DIVERSE_SCTS,
-            policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts,
-                                                      BoundNetLog()));
-  EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_NOT_DIVERSE_SCTS,
-            policy_enforcer_->DoesConformToCTEVPolicy(chain_.get(), nullptr,
-                                                      scts, BoundNetLog()));
-
-  // SCT from after disqualification.
-  scts.clear();
-  FillListWithSCTsOfOrigin(
-      ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION, 1, &scts);
-  AddDisqualifiedLogSCT(ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION,
-                        true, &scts);
-  EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_NOT_DIVERSE_SCTS,
-            policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts,
-                                                      BoundNetLog()));
-  EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_NOT_DIVERSE_SCTS,
-            policy_enforcer_->DoesConformToCTEVPolicy(chain_.get(), nullptr,
-                                                      scts, BoundNetLog()));
-
-  // Embedded SCT from before disqualification.
-  scts.clear();
-  FillListWithSCTsOfOrigin(
-      ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION, 1, &scts);
-  AddDisqualifiedLogSCT(ct::SignedCertificateTimestamp::SCT_EMBEDDED, false,
-                        &scts);
-  EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_NOT_DIVERSE_SCTS,
-            policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts,
-                                                      BoundNetLog()));
-  EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_NOT_DIVERSE_SCTS,
-            policy_enforcer_->DoesConformToCTEVPolicy(chain_.get(), nullptr,
-                                                      scts, BoundNetLog()));
-
-  // Embedded SCT from after disqualification.
-  scts.clear();
-  FillListWithSCTsOfOrigin(
-      ct::SignedCertificateTimestamp::SCT_FROM_TLS_EXTENSION, 1, &scts);
-  AddDisqualifiedLogSCT(ct::SignedCertificateTimestamp::SCT_EMBEDDED, true,
-                        &scts);
-  EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_NOT_DIVERSE_SCTS,
-            policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts,
-                                                      BoundNetLog()));
-  EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_NOT_DIVERSE_SCTS,
-            policy_enforcer_->DoesConformToCTEVPolicy(chain_.get(), nullptr,
-                                                      scts, BoundNetLog()));
-}
-
-TEST_F(CTPolicyEnforcerTest,
-       ConformsWithDisqualifiedLogBeforeDisqualificationDate) {
-  ct::SCTList scts;
-  FillListWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 4,
-                           &scts);
-  AddDisqualifiedLogSCT(ct::SignedCertificateTimestamp::SCT_EMBEDDED, false,
-                        &scts);
-
-  // This chain_ is valid for 10 years - over 121 months - so requires 5 SCTs.
-  EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS,
-            policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts,
-                                                      BoundNetLog()));
-  EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_COMPLIES_VIA_SCTS,
-            policy_enforcer_->DoesConformToCTEVPolicy(chain_.get(), nullptr,
-                                                      scts, BoundNetLog()));
-}
-
-TEST_F(CTPolicyEnforcerTest,
-       DoesNotConformWithDisqualifiedLogAfterDisqualificationDate) {
-  ct::SCTList scts;
-  FillListWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 4,
-                           &scts);
-  AddDisqualifiedLogSCT(ct::SignedCertificateTimestamp::SCT_EMBEDDED, true,
-                        &scts);
-
-  // This chain_ is valid for 10 years - over 121 months - so requires 5 SCTs.
-  EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_NOT_ENOUGH_SCTS,
-            policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts,
-                                                      BoundNetLog()));
-  EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_NOT_ENOUGH_SCTS,
-            policy_enforcer_->DoesConformToCTEVPolicy(chain_.get(), nullptr,
-                                                      scts, BoundNetLog()));
-}
-
-TEST_F(CTPolicyEnforcerTest,
-       DoesNotConformWithIssuanceDateAfterDisqualificationDate) {
-  ct::SCTList scts;
-  AddDisqualifiedLogSCT(ct::SignedCertificateTimestamp::SCT_EMBEDDED, true,
-                        &scts);
-  FillListWithSCTsOfOrigin(ct::SignedCertificateTimestamp::SCT_EMBEDDED, 4,
-                           &scts);
-  // Make sure all SCTs are after the disqualification date.
-  for (size_t i = 1; i < scts.size(); ++i)
-    scts[i]->timestamp = scts[0]->timestamp;
-
-  // This chain_ is valid for 10 years - over 121 months - so requires 5 SCTs.
-  EXPECT_EQ(ct::CertPolicyCompliance::CERT_POLICY_NOT_ENOUGH_SCTS,
-            policy_enforcer_->DoesConformToCertPolicy(chain_.get(), scts,
-                                                      BoundNetLog()));
-  EXPECT_EQ(ct::EVPolicyCompliance::EV_POLICY_NOT_ENOUGH_SCTS,
-            policy_enforcer_->DoesConformToCTEVPolicy(chain_.get(), nullptr,
-                                                      scts, BoundNetLog()));
-}
-
 TEST_F(CTPolicyEnforcerTest,
        DoesNotConformToCTEVPolicyNotEnoughUniqueEmbeddedLogs) {
   ct::SCTList scts;

[paulmiller, 2016-05-10 01:01:31]

The CQ bit was checked by paulmiller@chromium.org

[commit-bot: I haz the power, 2016-05-10 01:01:51]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1956273003/140001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1956273003/140001

[commit-bot: I haz the power, 2016-05-10 01:02:39]

Description was changed from

==========
Revert of Mark the Certly.io log as disqualified, as of April 15 2016 (patchset
#6 id:90001 of https://codereview.chromium.org/1941273002/ )

Reason for revert:
This seems to be the most likely cause of this CertVerifyProcTest failure:
https://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20(dbg)/...

Original issue's description:
> Mark the Certly.io log as disqualified, as of April 15 2016
> 
> BUG=none
> 
> Committed: https://crrev.com/4db616c441f693e7eca3c7f5f7452fdfd4b84eb2
> Cr-Commit-Position: refs/heads/master@{#392444}

TBR=eroman@chromium.org,eranm@chromium.org,rsleevi@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none
==========

to

==========
Revert of Mark the Certly.io log as disqualified, as of April 15 2016 (patchset
#6 id:90001 of https://codereview.chromium.org/1941273002/ )

Reason for revert:
This seems to be the most likely cause of this CertVerifyProcTest failure:
https://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20(dbg)/...

Original issue's description:
> Mark the Certly.io log as disqualified, as of April 15 2016
> 
> BUG=none
> 
> Committed: https://crrev.com/4db616c441f693e7eca3c7f5f7452fdfd4b84eb2
> Cr-Commit-Position: refs/heads/master@{#392444}

TBR=eroman@chromium.org,eranm@chromium.org,rsleevi@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none
==========

[commit-bot: I haz the power, 2016-05-10 01:02:40]

Committed patchset #2 (id:140001)

[commit-bot: I haz the power, 2016-05-10 01:03:35]

Description was changed from

==========
Revert of Mark the Certly.io log as disqualified, as of April 15 2016 (patchset
#6 id:90001 of https://codereview.chromium.org/1941273002/ )

Reason for revert:
This seems to be the most likely cause of this CertVerifyProcTest failure:
https://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20(dbg)/...

Original issue's description:
> Mark the Certly.io log as disqualified, as of April 15 2016
> 
> BUG=none
> 
> Committed: https://crrev.com/4db616c441f693e7eca3c7f5f7452fdfd4b84eb2
> Cr-Commit-Position: refs/heads/master@{#392444}

TBR=eroman@chromium.org,eranm@chromium.org,rsleevi@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none
==========

to

==========
Revert of Mark the Certly.io log as disqualified, as of April 15 2016 (patchset
#6 id:90001 of https://codereview.chromium.org/1941273002/ )

Reason for revert:
This seems to be the most likely cause of this CertVerifyProcTest failure:
https://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20(dbg)/...

Original issue's description:
> Mark the Certly.io log as disqualified, as of April 15 2016
>
> BUG=none
>
> Committed: https://crrev.com/4db616c441f693e7eca3c7f5f7452fdfd4b84eb2
> Cr-Commit-Position: refs/heads/master@{#392444}

TBR=eroman@chromium.org,eranm@chromium.org,rsleevi@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

Committed: https://crrev.com/4036d8cfb59821cd3411004851e934a3b3293dfc
Cr-Commit-Position: refs/heads/master@{#392502}
==========

[commit-bot: I haz the power, 2016-05-10 01:03:37]

Patchset 2 (id:??) landed as
https://crrev.com/4036d8cfb59821cd3411004851e934a3b3293dfc
Cr-Commit-Position: refs/heads/master@{#392502}

[Ryan Sleevi, 2016-05-10 01:51:07]

A revert of this CL (patchset #2 id:140001) has been created in
https://codereview.chromium.org/1960423002/ by rsleevi@chromium.org.

The reason for reverting is: Unreverting; test failure was unrelated..