Remove duplicated enums for certificate errors

Add missing CertificateSymantecLegacy.

Change-Id: I395f0c4a8c69fe3e0c303a13a3cbc077c123d26d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 3 insertions, 35 deletions

diff --git a/src/core/api/qwebenginecertificateerror.cpp b/src/core/api/qwebenginecertificateerror.cpp
index 098986132..33f63f2da 100644
--- a/src/core/api/qwebenginecertificateerror.cpp
+++ b/src/core/api/qwebenginecertificateerror.cpp
@@ -43,39 +43,6 @@
 
 QT_BEGIN_NAMESPACE
 
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::SslPinnedKeyNotInCertificateChain,
-                   QWebEngineCertificateError::SslPinnedKeyNotInCertificateChain);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateCommonNameInvalid,
-                   QWebEngineCertificateError::CertificateCommonNameInvalid);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateCommonNameInvalid,
-                   QWebEngineCertificateError::CertificateCommonNameInvalid);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateDateInvalid,
-                   QWebEngineCertificateError::CertificateDateInvalid);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateAuthorityInvalid,
-                   QWebEngineCertificateError::CertificateAuthorityInvalid);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateContainsErrors,
-                   QWebEngineCertificateError::CertificateContainsErrors);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateUnableToCheckRevocation,
-                   QWebEngineCertificateError::CertificateUnableToCheckRevocation);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateRevoked,
-                   QWebEngineCertificateError::CertificateRevoked);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateInvalid,
-                   QWebEngineCertificateError::CertificateInvalid);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateWeakSignatureAlgorithm,
-                   QWebEngineCertificateError::CertificateWeakSignatureAlgorithm);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateNonUniqueName,
-                   QWebEngineCertificateError::CertificateNonUniqueName);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateWeakKey,
-                   QWebEngineCertificateError::CertificateWeakKey);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateNameConstraintViolation,
-                   QWebEngineCertificateError::CertificateNameConstraintViolation);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateValidityTooLong,
-                   QWebEngineCertificateError::CertificateValidityTooLong);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateTransparencyRequired,
-                   QWebEngineCertificateError::CertificateTransparencyRequired);
-ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateKnownInterceptionBlocked,
-                   QWebEngineCertificateError::CertificateKnownInterceptionBlocked);
-
 /*!
     \class QWebEngineCertificateError
     \brief The QWebEngineCertificateError class provides information about a certificate error.
@@ -160,7 +127,7 @@ QUrl QWebEngineCertificateError::url() const
 */
 QWebEngineCertificateError::Type QWebEngineCertificateError::type() const
 {
-    return Type(d->error());
+    return d->error();
 }
 
 /*!
diff --git a/src/core/api/qwebenginecertificateerror.h b/src/core/api/qwebenginecertificateerror.h
index 1fdea42be..3cf2d9990 100644
--- a/src/core/api/qwebenginecertificateerror.h
+++ b/src/core/api/qwebenginecertificateerror.h
@@ -65,7 +65,7 @@ public:
     QWebEngineCertificateError& operator=(const QWebEngineCertificateError &other);
     ~QWebEngineCertificateError();
 
-    // Keep this identical to CertificateErrorController::CertificateError, or add mapping layer.
+    // Keep this identical to NET_ERROR in net_error_list.h, or add mapping layer.
     enum Type {
         SslPinnedKeyNotInCertificateChain = -150,
         CertificateCommonNameInvalid = -200,
@@ -82,6 +82,7 @@ public:
         CertificateNameConstraintViolation = -212,
         CertificateValidityTooLong = -213,
         CertificateTransparencyRequired = -214,
+        CertificateSymantecLegacy = -215,
         CertificateKnownInterceptionBlocked = -217,
     };
     Q_ENUM(Type)