Disable Name Mismatch redirection for non-overridable SSL errors

chrome/browser/ssl/ssl_error_handler.cc

Index: chrome/browser/ssl/ssl_error_handler.cc
diff --git a/chrome/browser/ssl/ssl_error_handler.cc b/chrome/browser/ssl/ssl_error_handler.cc
index 3a0d43d02630446805dac674a2e609d6aaee9f53..d6da75a9f27c35cf4a4008a27ead28f7c3ec4e4a 100644
--- a/chrome/browser/ssl/ssl_error_handler.cc
+++ b/chrome/browser/ssl/ssl_error_handler.cc
@@ -15,6 +15,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
+#include "net/base/net_errors.h"
 
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
 #include "chrome/browser/captive_portal/captive_portal_service.h"
@@ -154,7 +155,7 @@ void SSLErrorHandler::StartHandlingError() {
   DCHECK(!dns_names.empty());
   GURL suggested_url;
   if (IsSSLCommonNameMismatchHandlingEnabled() &&
-      ssl_info_.cert_status == net::CERT_STATUS_COMMON_NAME_INVALID &&
+      cert_error_ == net::ERR_CERT_COMMON_NAME_INVALID && IsOverridable() &&
       GetSuggestedUrl(dns_names, &suggested_url)) {
     RecordUMA(WWW_MISMATCH_FOUND);
     net::CertStatus extra_cert_errors =
@@ -233,6 +234,10 @@ void SSLErrorHandler::NavigateToSuggestedURL(const GURL& suggested_url) {
   web_contents()->GetController().LoadURLWithParams(load_params);
 }
 
+bool SSLErrorHandler::IsOverridable() {
+  return SSLBlockingPage::IsOverridable(options_mask_, profile_);
+}
+
 void SSLErrorHandler::CheckForCaptivePortal() {
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
   CaptivePortalService* captive_portal_service =
@@ -246,9 +251,8 @@ void SSLErrorHandler::CheckForCaptivePortal() {
 void SSLErrorHandler::ShowCaptivePortalInterstitial(const GURL& landing_url) {
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
   // Show captive portal blocking page. The interstitial owns the blocking page.
-  RecordUMA(SSLBlockingPage::IsOverridable(options_mask_, profile_)
-                ? SHOW_CAPTIVE_PORTAL_INTERSTITIAL_OVERRIDABLE
-                : SHOW_CAPTIVE_PORTAL_INTERSTITIAL_NONOVERRIDABLE);
+  RecordUMA(IsOverridable() ? SHOW_CAPTIVE_PORTAL_INTERSTITIAL_OVERRIDABLE
+                            : SHOW_CAPTIVE_PORTAL_INTERSTITIAL_NONOVERRIDABLE);
   (new CaptivePortalBlockingPage(web_contents_, request_url_, landing_url,
                                  ssl_cert_reporter_.Pass(), ssl_info_,
                                  callback_))->Show();
@@ -262,9 +266,8 @@ void SSLErrorHandler::ShowCaptivePortalInterstitial(const GURL& landing_url) {
 
 void SSLErrorHandler::ShowSSLInterstitial() {
   // Show SSL blocking page. The interstitial owns the blocking page.
-  RecordUMA(SSLBlockingPage::IsOverridable(options_mask_, profile_)
-                ? SHOW_SSL_INTERSTITIAL_OVERRIDABLE
-                : SHOW_SSL_INTERSTITIAL_NONOVERRIDABLE);
+  RecordUMA(IsOverridable() ? SHOW_SSL_INTERSTITIAL_OVERRIDABLE
+                            : SHOW_SSL_INTERSTITIAL_NONOVERRIDABLE);
 
   (new SSLBlockingPage(web_contents_, cert_error_, ssl_info_, request_url_,
                        options_mask_, base::Time::NowFromSystemTime(),