Add custom interstitial for captive portals.

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 d301fbac4014211e6b836017ba4177a4e068775c..40ffd982a740bfffb88fd85c915b98790a3e4d5d 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -330,8 +330,7 @@ SSLBlockingPage::SSLBlockingPage(content::WebContents* web_contents,
       callback_(callback),
       cert_error_(cert_error),
       ssl_info_(ssl_info),
-      overridable_(options_mask & OVERRIDABLE &&
-                   !(options_mask & STRICT_ENFORCEMENT)),
+      overridable_(IsOverridable(options_mask)),
       danger_overridable_(true),
       strict_enforcement_((options_mask & STRICT_ENFORCEMENT) != 0),
       internal_(false),
@@ -452,31 +451,6 @@ void SSLBlockingPage::PopulateInterstitialStrings(
 
   // Conditional UI configuration.
   if (bad_clock) {
-    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
-
-    // We're showing the SSL clock warning to be helpful, but we haven't warned
-    // them about the risks. (And there might still be an SSL error after they
-    // fix their clock.) Thus, we don't allow the "danger" override in this
-    // case.
-    danger_overridable_ = false;
-
-    int heading_string = SSLErrorClassification::IsUserClockInTheFuture(now) ?
-                              IDS_SSL_V2_CLOCK_AHEAD_HEADING :
-                              IDS_SSL_V2_CLOCK_BEHIND_HEADING;
-
-    load_time_data->SetString(
-        "tabTitle",
-        l10n_util::GetStringUTF16(IDS_SSL_V2_CLOCK_TITLE));
-    load_time_data->SetString(
-        "heading",
-        l10n_util::GetStringUTF16(heading_string));
     load_time_data->SetString("primaryParagraph",

[mmenke, 2014/12/09 22:42:26]

Does removing this clock logic belong in this CL?

[meacer, 2014/12/10 22:48:02]

Another rebase artifact. Gone.

                               l10n_util::GetStringFUTF16(
                                   IDS_SSL_V2_CLOCK_PRIMARY_PARAGRAPH ,