Move error classification into the ssl_errors component

chrome/browser/ssl/bad_clock_blocking_page.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ssl/bad_clock_blocking_page.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/build_time.h"
 #include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "base/i18n/time_formatting.h"
 #include "base/process/launch.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/interstitials/chrome_metrics_helper.h"
 #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/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"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/signed_certificate_timestamp_store.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 150 matching lines @@
   set_metrics_helper(chrome_metrics_helper.Pass());
   metrics_helper()->RecordUserInteraction(
       security_interstitials::MetricsHelper::TOTAL_VISITS);
 
   cert_report_helper_.reset(new CertReportHelper(
       ssl_cert_reporter.Pass(), web_contents, request_url, ssl_info,
       certificate_reporting::ErrorReport::INTERSTITIAL_CLOCK,
       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,

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

nit: is the 'false' overridable? Can you either make this argument an enum or
add /* overridable */?

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

I really hate putting comments inline, but this bool now appears in enough
places that an enum would make sense. But I also don't want to do a refactor for
that in this CL (there are many places where overridable status is passed), so
I'll do this in a followup cleanup pass.

+                                  cert_error_, *ssl_info_.cert.get());
 }
 
 bool BadClockBlockingPage::ShouldCreateNewNavigation() const {
   return true;
 }
 
 InterstitialPageDelegate::TypeID BadClockBlockingPage::GetTypeForTesting()
     const {
   return BadClockBlockingPage::kTypeForTesting;
 }
@@ skipping 22 matching lines @@
 
   // Strings for the bad clock warning specifically.
   load_time_data->SetBoolean("bad_clock", true);
   load_time_data->SetBoolean("overridable", false);
 #if defined(OS_IOS)
   load_time_data->SetBoolean("hide_primary_button", true);
 #else
   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));
   load_time_data->SetString("heading",
                             l10n_util::GetStringUTF16(heading_string));
   load_time_data->SetString(
       "primaryParagraph",
       l10n_util::GetStringFUTF16(
           IDS_CLOCK_ERROR_PRIMARY_PARAGRAPH, url,
           base::TimeFormatFriendlyDateAndTime(time_triggered_)));
@@ skipping 112 matching lines @@
 
 void BadClockBlockingPage::NotifyDenyCertificate() {
   // It's possible that callback_ may not exist if the user clicks "Proceed"
   // followed by pressing the back button before the interstitial is hidden.
   // In that case the certificate will still be treated as allowed.
   if (callback_.is_null())
     return;
 
   base::ResetAndReturn(&callback_).Run(false);
 }