Cleanup HPKP error handling and weak DH key handling

components/ssl_errors/error_info.cc

Index: components/ssl_errors/error_info.cc
diff --git a/components/ssl_errors/error_info.cc b/components/ssl_errors/error_info.cc
index 06dc3cbe86ffb7afd2e583640291a6ce141e9b33..310abccf4a1fe79b9cbfe3d46b2290bf94982506 100644
--- a/components/ssl_errors/error_info.cc
+++ b/components/ssl_errors/error_info.cc
@@ -131,12 +131,6 @@ ErrorInfo ErrorInfo::CreateError(ErrorType error_type,
       short_description =
           l10n_util::GetStringUTF16(IDS_CERT_ERROR_WEAK_KEY_DESCRIPTION);
       break;
-    case CERT_WEAK_KEY_DH:
-      details = l10n_util::GetStringFUTF16(IDS_CERT_ERROR_WEAK_KEY_DETAILS,

[davidben, 2016/06/21 00:14:11]

Remove this string? (Huh. Given the text of this string, I rather suspect
someone was confused about what weak DH group was. The text says it's in the
certificate, but it's not.)

[Ryan Sleevi, 2016/06/21 00:23:04]

It's used right above :)

[davidben, 2016/06/21 00:27:52]

...wow, I'm blind. Also apparently I get confused by codesearch's UI. :-)

-                                           UTF8ToUTF16(request_url.host()));
-      short_description =
-          l10n_util::GetStringUTF16(IDS_CERT_ERROR_WEAK_KEY_DESCRIPTION);

[davidben, 2016/06/21 00:14:11]

Ditto.

[Ryan Sleevi, 2016/06/21 00:23:05]

Ditto :)

-      break;
     case CERT_NAME_CONSTRAINT_VIOLATION:
       details = l10n_util::GetStringFUTF16(
           IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DETAILS,
@@ -203,8 +197,6 @@ ErrorInfo::ErrorType ErrorInfo::NetErrorToErrorType(int net_error) {
       return CERT_NAME_CONSTRAINT_VIOLATION;
     case net::ERR_CERT_VALIDITY_TOO_LONG:
       return CERT_VALIDITY_TOO_LONG;
-    case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY:
-      return CERT_WEAK_KEY_DH;
     case net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN:
       return CERT_PINNED_KEY_MISSING;
     default: