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

Unified Diff: chrome/browser/ssl/bad_clock_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: remove size_t / int mixing Created 5 years, 1 month 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
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/ssl/common_name_mismatch_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/bad_clock_blocking_page.cc
diff --git a/chrome/browser/ssl/bad_clock_blocking_page.cc b/chrome/browser/ssl/bad_clock_blocking_page.cc
index 0fb13634e7577ba0700bac203ccf7d2d4c9b8fd2..6ad49b92c2d168e8c8160b553314537ca1587dbd 100644
--- a/chrome/browser/ssl/bad_clock_blocking_page.cc
+++ b/chrome/browser/ssl/bad_clock_blocking_page.cc
@@ -26,10 +26,10 @@
#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/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "components/google/core/browser/google_util.h"
+#include "components/ssl_errors/error_classification.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/cert_store.h"
#include "content/public/browser/interstitial_page.h"
@@ -46,6 +46,7 @@
#include "grit/components_strings.h"
#include "net/base/net_errors.h"
#include "net/base/net_util.h"
+#include "net/cert/x509_certificate.h"
#include "ui/base/l10n/l10n_util.h"
#if defined(OS_ANDROID)
@@ -200,9 +201,8 @@ BadClockBlockingPage::BadClockBlockingPage(
false /* overridable */, metrics_helper()));
// TODO(felt): Separate the clock statistics from the main ssl statistics.
- SSLErrorClassification classifier(time_triggered_, request_url, cert_error_,
- *ssl_info_.cert.get());
- classifier.RecordUMAStatistics(false);
+ ssl_errors::RecordUMAStatistics(false, time_triggered_, request_url,
+ cert_error_, *ssl_info_.cert.get());
}
bool BadClockBlockingPage::ShouldCreateNewNavigation() const {
@@ -245,10 +245,9 @@ void BadClockBlockingPage::PopulateInterstitialStrings(
load_time_data->SetBoolean("hide_primary_button", false);
#endif
- int heading_string =
- SSLErrorClassification::IsUserClockInTheFuture(time_triggered_)
- ? IDS_CLOCK_ERROR_AHEAD_HEADING
- : IDS_CLOCK_ERROR_BEHIND_HEADING;
+ int heading_string = ssl_errors::IsUserClockInTheFuture(time_triggered_)
+ ? IDS_CLOCK_ERROR_AHEAD_HEADING
+ : IDS_CLOCK_ERROR_BEHIND_HEADING;
load_time_data->SetString("tabTitle",
l10n_util::GetStringUTF16(IDS_CLOCK_ERROR_TITLE));
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/ssl/common_name_mismatch_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698