Move error classification into the ssl_errors component

chrome/browser/ssl/ssl_blocking_page.cc

Index: chrome/browser/ssl/ssl_blocking_page.cc
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index 721df330a20067565798da191bc5eaf73c3992e9..d26a9755ea81945b4f8108cbb8602ba8ae4daee2 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -26,12 +26,12 @@
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/ssl/cert_report_helper.h"
 #include "chrome/browser/ssl/ssl_cert_reporter.h"
-#include "chrome/browser/ssl/ssl_error_classification.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/google/core/browser/google_util.h"
+#include "components/ssl_errors/error_classification.h"
 #include "components/ssl_errors/error_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
@@ -157,9 +157,8 @@ SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents,
       certificate_reporting::ErrorReport::INTERSTITIAL_SSL, overridable_,
       metrics_helper()));
 
-  SSLErrorClassification error_classification(
-      time_triggered_, request_url, cert_error_, *ssl_info_.cert.get());
-  error_classification.RecordUMAStatistics(overridable_);
+  ssl_errors::RecordUMAStatistics(overridable_, time_triggered_, request_url,
+                                  cert_error_, *ssl_info_.cert.get());
 
   // Creating an interstitial without showing (e.g. from chrome://interstitials)
   // it leaks memory, so don't create it here.
@@ -229,17 +228,9 @@ void SSLBlockingPage::PopulateInterstitialStrings(
 
     ssl_errors::ErrorInfo::ErrorType type =
         ssl_errors::ErrorInfo::NetErrorToErrorType(cert_error_);
-    if (type == ssl_errors::ErrorInfo::CERT_INVALID &&
-        SSLErrorClassification::MaybeWindowsLacksSHA256Support()) {
-      load_time_data->SetString(

[estark, 2015/10/02 22:17:21]

What happened to this bit?

[felt, 2015/10/05 05:26:40]

We don't need it anymore since Chrome now provides SHA 256 support for Windows
OSes that don't have it. I killed the MaybeWindowsLacksSHA256Support method so
I'm killing the sole caller too.

-          "explanationParagraph",
-          l10n_util::GetStringFUTF16(IDS_SSL_NONOVERRIDABLE_MORE_INVALID_SP3,
-                                     url));
-    } else {
-      load_time_data->SetString(
-          "explanationParagraph",
-          l10n_util::GetStringFUTF16(IDS_SSL_NONOVERRIDABLE_MORE, url));
-    }
+    load_time_data->SetString(
+        "explanationParagraph",
+        l10n_util::GetStringFUTF16(IDS_SSL_NONOVERRIDABLE_MORE, url));
     load_time_data->SetString("primaryButtonText",
                               l10n_util::GetStringUTF16(IDS_SSL_RELOAD));
     // Customize the help link depending on the specific error type.