Revert of Distrust publicly trusted SHA-1 certs

net/cert/cert_verify_proc.h

Index: net/cert/cert_verify_proc.h
diff --git a/net/cert/cert_verify_proc.h b/net/cert/cert_verify_proc.h
index 2154dbab690c8f0d97bf1071bfcf2391ace83d78..629fde8bf38369fd1367060a21c7239f0d15f5ff 100644
--- a/net/cert/cert_verify_proc.h
+++ b/net/cert/cert_verify_proc.h
@@ -8,7 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "base/feature_list.h"
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -84,8 +83,6 @@
   friend class base::RefCountedThreadSafe<CertVerifyProc>;
   FRIEND_TEST_ALL_PREFIXES(CertVerifyProcTest, DigiNotarCerts);
   FRIEND_TEST_ALL_PREFIXES(CertVerifyProcTest, TestHasTooLongValidity);
-  FRIEND_TEST_ALL_PREFIXES(CertVerifyProcTest,
-                           VerifyRejectsSHA1AfterDeprecationLegacyMode);
 
   // Performs the actual verification using the desired underlying
   // cryptographic library. On entry, |verify_result->verified_cert|
@@ -127,9 +124,6 @@
   // (i.e. by 1 July 2019).
   static bool HasTooLongValidity(const X509Certificate& cert);
 
-  // Emergency kill-switch for SHA-1 deprecation. Disabled by default.
-  static const base::Feature kSHA1LegacyMode;
-
   DISALLOW_COPY_AND_ASSIGN(CertVerifyProc);
 };