Always show SSL error code at bottom of interstitial

Previously, the SSL interstitial only displayed this for the non-overridable pages. Now it displays it for all SSL errors.

BUG=

Review URL: https://codereview.chromium.org/407693003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284528 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/resources/ssl/interstitial_v2.js

@@ -14,6 +14,8 @@ function setupEvents() {
   if (ssl) {
     $('body').classList.add('ssl');
     setupSSLFinchTrial();  /* From ssl_errors_common.js. */
+    $('error-code').textContent = loadTimeData.getString('errorCode');
+    $('error-code').classList.remove('hidden');
   } else {
     $('body').classList.add('safe-browsing');
     setupMalwareFinchExperiment();  /* From safe_browsing_v3.js. */
@@ -50,11 +52,6 @@ function setupEvents() {
     });
   }
 
-  if (ssl && !overridable) {
-    $('error-code').textContent = loadTimeData.getString('errorCode');
-    $('error-code').classList.remove('hidden');
-  }
-
   if (ssl && $('clock-link')) {
     $('clock-link').addEventListener('click', function(event) {
       sendCommand(CMD_CLOCK);

chrome/browser/ssl/ssl_blocking_page.cc

@@ -511,6 +511,7 @@ std::string SSLBlockingPage::GetHTMLContentsV2() {
   load_time_data.SetString(
      "closeDetails",
      l10n_util::GetStringUTF16(IDS_SSL_V2_CLOSE_DETAILS_BUTTON));
+  load_time_data.SetString("errorCode", net::ErrorToString(cert_error_));
 
   if (overridable_ && !strict_enforcement_) {  // Overridable.
     SSLErrorInfo error_info =
@@ -557,7 +558,6 @@ std::string SSLBlockingPage::GetHTMLContentsV2() {
     }
     load_time_data.SetString(
         "finalParagraph", l10n_util::GetStringFUTF16(help_string, url));
-    load_time_data.SetString("errorCode", net::ErrorToString(cert_error_));
   }
 
   base::StringPiece html(