Improve the SSL error display when the clock is wrong.

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 458a166768046d226b04431f58575424208c414c..84382762b9a5a620cf780a98c75ee872885a8537 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -575,15 +575,35 @@ 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 ((SSLErrorClassification::IsUserClockInThePast(
-      base::Time::NowFromSystemTime()))
+
+  base::Time now = base::Time::NowFromSystemTime();
+  if ((SSLErrorClassification::IsUserClockInThePast(now) ||
+       SSLErrorClassification::IsUserClockInTheFuture(now))
       && (SSLErrorInfo::NetErrorToErrorType(cert_error_) ==
           SSLErrorInfo::CERT_DATE_INVALID)) {
     load_time_data.SetString("primaryParagraph",
                              l10n_util::GetStringFUTF16(
                                  IDS_SSL_CLOCK_ERROR,
                                  url,
-                                 base::TimeFormatShortDate(base::Time::Now())));
+                                 base::TimeFormatShortDate(now)));
+    if (overridable_ && !strict_enforcement_) {
+      load_time_data.SetString(
+          "finalParagraph",
+          l10n_util::GetStringFUTF16(IDS_SSL_OVERRIDABLE_PROCEED_PARAGRAPH,
+                                     url));
+      load_time_data.SetString(
+          "primaryButtonText",
+          l10n_util::GetStringUTF16(IDS_SSL_NONOVERRIDABLE_RELOAD_BUTTON));
+    } else {
+      load_time_data.SetString(
+          "primaryButtonText",
+          l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_SAFETY_BUTTON));
+    }
+
+    base::StringPiece html(
+       ResourceBundle::GetSharedInstance().GetRawDataResource(
+           IRD_SSL_INTERSTITIAL_V2_HTML));
+    return webui::GetI18nTemplateHtml(html, &load_time_data);
   } else {
     load_time_data.SetString(
         "primaryParagraph",
@@ -655,6 +675,7 @@ std::string SSLBlockingPage::GetHTMLContentsV2() {
   base::StringPiece html(
      ResourceBundle::GetSharedInstance().GetRawDataResource(
          IRD_SSL_INTERSTITIAL_V2_HTML));
+  // TODO(palmer): Is this line dead code?

[felt, 2014/08/07 18:09:09]

No. For some bizarre reason webui depends on this. It is ugly but what seems to
be done at the moment. /

   webui::UseVersion2 version;
   return webui::GetI18nTemplateHtml(html, &load_time_data);
 }