Calculate severity score for date_invalid error

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 212172ec99332601943cc076b03fa3d64b1f62f9..ea677ccc7c5c7fe083d0bcdd33fa6269742db5e6 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
+#include "chrome/browser/ssl/ssl_error_classification.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/cert_store.h"
@@ -215,45 +216,6 @@ void RecordSSLBlockingPageDetailedStats(
   }
 }
 
-// Events for UMA. Do not reorder or change!
-enum SSLInterstitialCause {
-  CLOCK_PAST,
-  CLOCK_FUTURE,
-  UNUSED_INTERSTITIAL_CAUSE_ENTRY,
-};
-
-void RecordSSLInterstitialCause(bool overridable, SSLInterstitialCause event) {
-  if (overridable) {
-    UMA_HISTOGRAM_ENUMERATION("interstitial.ssl.cause.overridable",
-                              event,
-                              UNUSED_INTERSTITIAL_CAUSE_ENTRY);
-  } else {
-    UMA_HISTOGRAM_ENUMERATION("interstitial.ssl.cause.nonoverridable",
-                              event,
-                              UNUSED_INTERSTITIAL_CAUSE_ENTRY);
-  }
-}
-
-// The cause of most clock errors (CMOS battery causing clock reset) will
-// fall backwards, not forwards. IsErrorProbablyCausedByClock therefore only
-// returns true for clocks set early, and histograms clocks set far into the
-// future to see if there are more future-clocks than expected.
-bool IsErrorProbablyCausedByClock(bool overridable, int cert_info) {
-  if (SSLErrorInfo::NetErrorToErrorType(cert_info) !=
-      SSLErrorInfo::CERT_DATE_INVALID) {
-    return false;
-  }
-  const base::Time current_time = base::Time::NowFromSystemTime();
-  const base::Time build_time = base::GetBuildTime();
-  if (current_time < build_time - base::TimeDelta::FromDays(2)) {
-    RecordSSLInterstitialCause(overridable, CLOCK_PAST);
-    return true;
-  }
-  if (current_time > build_time + base::TimeDelta::FromDays(365))
-    RecordSSLInterstitialCause(overridable, CLOCK_FUTURE);
-  return false;
-}
-
 }  // namespace
 
 // Note that we always create a navigation entry with SSL errors.
@@ -300,6 +262,12 @@ SSLBlockingPage::SSLBlockingPage(
           &request_tracker_);
     }
   }
+  if (SSLErrorInfo::NetErrorToErrorType(cert_error_) ==
+      SSLErrorInfo::CERT_DATE_INVALID) {
+    SSLErrorClassification ssl_error(base::Time::NowFromSystemTime(),
+                                     ssl_info_.cert.get());
+    ssl_error.RecordUMAStatistics(overridable_ && !strict_enforcement_);
+  }
 
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
   CaptivePortalService* captive_portal_service =
@@ -524,8 +492,10 @@ std::string SSLBlockingPage::GetHTMLContentsV2() {
       "tabTitle", l10n_util::GetStringUTF16(IDS_SSL_V2_TITLE));
   load_time_data.SetString(
       "heading", l10n_util::GetStringUTF16(IDS_SSL_V2_HEADING));
-  if (IsErrorProbablyCausedByClock(
-          overridable_ && !strict_enforcement_, cert_error_)) {
+  if ((SSLErrorClassification::IsUserClockInThePast(
+      base::Time::NowFromSystemTime()))
+      && (SSLErrorInfo::NetErrorToErrorType(cert_error_) ==

[palmer, 2014/07/10 21:40:04]

Style nit: Usually, more parentheses is more good, but in this case I think it'd
be better to have just:

    && SSLErrorInfo::NetErrorToErrorType(cert_error_) ==
SSLErrorInfo::CERT_DATE_INVALID

But, your call.

[radhikabhar, 2014/07/11 04:16:14]

Done.

+          SSLErrorInfo::CERT_DATE_INVALID)) {
     load_time_data.SetString("primaryParagraph",
                              l10n_util::GetStringFUTF16(
                                  IDS_SSL_CLOCK_ERROR,