Cleanup HPKP error handling and weak DH key handling

components/ssl_errors/error_info.h

Index: components/ssl_errors/error_info.h
diff --git a/components/ssl_errors/error_info.h b/components/ssl_errors/error_info.h
index de1af8f6bf91c6593b70b2849df9b705f5cd245f..474fb821f8dbbe293c6c50d947c25b9acdf4b14f 100644
--- a/components/ssl_errors/error_info.h
+++ b/components/ssl_errors/error_info.h
@@ -26,20 +26,20 @@ class ErrorInfo {
   // This enum is being histogrammed; please only add new values at the end.
   enum ErrorType {
     CERT_COMMON_NAME_INVALID = 0,
-    CERT_DATE_INVALID,
-    CERT_AUTHORITY_INVALID,
-    CERT_CONTAINS_ERRORS,
-    CERT_NO_REVOCATION_MECHANISM,
-    CERT_UNABLE_TO_CHECK_REVOCATION,
-    CERT_REVOKED,
-    CERT_INVALID,
-    CERT_WEAK_SIGNATURE_ALGORITHM,
-    CERT_WEAK_KEY,
-    CERT_NAME_CONSTRAINT_VIOLATION,
-    UNKNOWN,
-    CERT_WEAK_KEY_DH,
-    CERT_PINNED_KEY_MISSING,
-    CERT_VALIDITY_TOO_LONG,
+    CERT_DATE_INVALID = 1,
+    CERT_AUTHORITY_INVALID = 2,
+    CERT_CONTAINS_ERRORS = 3,
+    CERT_NO_REVOCATION_MECHANISM = 4,
+    CERT_UNABLE_TO_CHECK_REVOCATION = 5,
+    CERT_REVOKED = 6,
+    CERT_INVALID = 7,
+    CERT_WEAK_SIGNATURE_ALGORITHM = 8,
+    CERT_WEAK_KEY = 9,
+    CERT_NAME_CONSTRAINT_VIOLATION = 10,
+    UNKNOWN = 11,
+    // CERT_WEAK_KEY_DH = 12,
+    CERT_PINNED_KEY_MISSING = 13,
+    CERT_VALIDITY_TOO_LONG = 14,
     END_OF_ENUM
   };