Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6535)

Unified Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 1355413003: Move error classification into the ssl_errors component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 21477857108b489e078f7c743730b123a42e246f..e08270d452b601b70e51deb62fa8a151b7a0998e 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -25,13 +25,14 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/renderer_preferences_util.h"
#include "chrome/browser/ssl/cert_report_helper.h"
+#include "chrome/browser/ssl/chrome_error_classification.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"
estark 2015/09/23 22:42:19 Do you need to include both, or would chrome_error
#include "components/ssl_errors/error_info.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/cert_store.h"
@@ -155,12 +156,9 @@ SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents,
certificate_reporting::ErrorReport::INTERSTITIAL_SSL, overridable_,
metrics_helper()));
- ssl_error_classification_.reset(new SSLErrorClassification(
- web_contents,
- time_triggered_,
- request_url,
- cert_error_,
- *ssl_info_.cert.get()));
+ ssl_error_classification_.reset(
+ new ChromeErrorClassification(web_contents, time_triggered_, request_url,
estark 2015/09/23 22:42:19 If you decide to stick with this design (ChromeEC
+ cert_error_, *ssl_info_.cert.get()));
ssl_error_classification_->RecordUMAStatistics(overridable_);
// Creating an interstitial without showing (e.g. from chrome://interstitials)
@@ -236,7 +234,7 @@ void SSLBlockingPage::PopulateInterstitialStrings(
ssl_errors::ErrorInfo::ErrorType type =
ssl_errors::ErrorInfo::NetErrorToErrorType(cert_error_);
if (type == ssl_errors::ErrorInfo::CERT_INVALID &&
- SSLErrorClassification::MaybeWindowsLacksSHA256Support()) {
+ ssl_errors::ErrorClassification::MaybeWindowsLacksSHA256Support()) {
load_time_data->SetString(
"explanationParagraph",
l10n_util::GetStringFUTF16(IDS_SSL_NONOVERRIDABLE_MORE_INVALID_SP3,

Powered by Google App Engine
This is Rietveld 408576698