Delete the old SSL interstitial and Finch trial

BUG=386033

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

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

15 files changed, 1 insertions, 538 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e7cccef..e203d04 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -14524,29 +14524,6 @@ Do you accept?
       Enforce strict (hard fail if we can't get hashes)
     </message>
 
-    <!-- SSL interstitial V3 experiment -->
-    <message name="IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_NAME" desc="Name of the about:flags SSL interstitial v2 experiment">
-      TLS/SSL Warning Experiment
-    </message>
-    <message name="IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_DESCRIPTION" desc="Description of the about:flags SSL interstitial v2 experiment">
-      Switch between different versions of the TLS/SSL warning.
-    </message>
-    <message name="IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1" desc="Go back to the old (V1) version">
-      Old version
-    </message>
-    <message name="IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_GRAY" desc="The new interstitial, with a gray background (also default)">
-      New version, with gray background
-    </message>
-    <message name="IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_COLORFUL" desc="The new interstitial, with a colorful background">
-      New version, with colorful background
-    </message>
-    <message name="IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1_V2" desc="The old layout, with the new text">
-      Old layout with new text
-    </message>
-    <message name="IDS_FLAGS_SSL_INTERSTITIAL_VERSION_GUARD" desc="The new version, with a guard">
-      New version, with guard image
-    </message>
-
     <!-- Malware interstitial V3 experiment -->
     <message name="IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_NAME" desc="Name of the about:flags malware interstitial v3 experiment">
       Malware Warning Experiment
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index f98b1ed..ac60772 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -433,23 +433,6 @@ const Experiment::Choice kAnswersInSuggestChoices[] = {
 // Using independent flags (instead of flag=value flags) to be able to
 // associate the version with a FieldTrial. FieldTrials don't currently support
 // flag=value flags.
-const Experiment::Choice kSSLInterstitialVersions[] = {
-  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
-  { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1,
-    switches::kSSLInterstitialV1, "" },
-  { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_GRAY,
-    switches::kSSLInterstitialV2, "" },
-  { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_COLORFUL,
-    switches::kSSLInterstitialV2Yellow, "" },
-  { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_GUARD,
-    switches::kSSLInterstitialV2Guard, "" },
-  { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1_V2,
-    switches::kSSLInterstitialV1WithV2Text, "" },
-};
-
-// Using independent flags (instead of flag=value flags) to be able to
-// associate the version with a FieldTrial. FieldTrials don't currently support
-// flag=value flags.
 const Experiment::Choice kMalwareInterstitialVersions[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_FLAGS_MALWARE_INTERSTITIAL_VERSION_V2,
@@ -1886,13 +1869,6 @@ const Experiment kExperiments[] = {
   },
 #endif
   {
-    "ssl-interstitial-version",
-    IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_NAME,
-    IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_DESCRIPTION,
-    kOsAll,
-    MULTI_VALUE_TYPE(kSSLInterstitialVersions)
-  },
-  {
     "malware-interstitial-version",
     IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_NAME,
     IDS_FLAGS_MALWARE_INTERSTITIAL_TRIAL_DESCRIPTION,
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index e80ce86..d2b7ed8 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -76,8 +76,6 @@
       </if>
       <structure name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_date.html" flattenhtml="true" type="chrome_html" />
       <structure name="IRD_SSL_INTERSTITIAL_V2_HTML" file="resources\ssl\interstitial_v2.html" flattenhtml="true" type="chrome_html" />
-      <structure name="IDR_SSL_ROAD_BLOCK_HTML" file="resources\ssl\roadblock.html" flattenhtml="true" type="chrome_html" />
-      <structure name="IDR_SSL_BLOCKING_HTML" file="resources\ssl\blocking.html" flattenhtml="true" type="chrome_html" />
       <structure name="IDR_SAFE_BROWSING_MALWARE_BLOCK_V2" file="resources\safe_browsing\malware_block_v2.html" flattenhtml="true" type="chrome_html" />
     </structures>
     <includes>
diff --git a/chrome/browser/resources/ssl/blocking.css b/chrome/browser/resources/ssl/blocking.css
deleted file mode 100644
index 221dc34..0000000
--- a/chrome/browser/resources/ssl/blocking.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2013 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. */
-
-.explanation-par {
-  line-height: 18px;
-  padding: 0 20px 20px 20px;
-}
-
-#icon-lock {
-  content: -webkit-image-set(
-      url('images/1x/locked_page.png') 1x,
-      url('images/2x/locked_page.png') 2x);
-  padding-bottom: 15px;
-  padding-top: 10px;
-}
-
-/* Decrease padding at low sizes. */
-@media (max-width: 640px),
-@media (max-height: 640px) {
-  .explanation-par,
-  .ssl-help-box-inner {
-    padding: 0;
-  }
-}
-
-.ssl-help-box-inner {
-  padding: 0 20px;
-}
diff --git a/chrome/browser/resources/ssl/blocking.html b/chrome/browser/resources/ssl/blocking.html
deleted file mode 100644
index 95ea6f8..0000000
--- a/chrome/browser/resources/ssl/blocking.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html i18n-values="dir:textDirection">
-<head>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0,
-                                 maximum-scale=1.0, user-scalable=no">
-  <meta charset="utf-8">
-  <title i18n-content="title"></title>
-  <link rel="stylesheet" href="../../../renderer/resources/neterror.css">
-  <link rel="stylesheet" href="blocking.css">
-  <script src="../../../../ui/webui/resources/js/util.js"></script>
-  <script src="../../../renderer/resources/neterror.js"></script>
-  <script src="ssl_errors_common.js"></script>
-  <script src="blocking.js"></script>
-</head>
-<body>
-  <div id="main-frame-error">
-    <div id="box">
-      <div id="content-top">
-        <h1>
-          <div>
-            <img class="icon" id="icon-lock">
-          </div>
-          <span i18n-content="headline"></span>
-        </h1>
-        <p i18n-values=".innerHTML:message" class="explanation-par"></p>
-        <div id="buttons">
-          <button id="reload-button" i18n-content="reloadMsg"
-              class="blue-button text-button"></button>
-          <button id="more-less-button" i18n-content="more"
-              class="text-button"></button>
-        </div>
-      </div>
-      <div id="help-box-outer" class="hidden">
-        <div id="help-box-inner">
-          <div class="ssl-help-box-inner">
-            <h2 i18n-content="moreTitle"></h2>
-            <p i18n-values=".innerHTML:moreMessage"></p>
-          </div>
-          <div class="ssl-help-box-inner">
-            <h2 i18n-content="techTitle"></h2>
-            <p>
-              <span i18n-content="failure"></span><br>
-              <span i18n-content="errorType"></span><br>
-              <span i18n-content="subject"></span><br>
-              <span i18n-content="issuer"></span><br>
-              <span i18n-content="fingerprint"></span>
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/chrome/browser/resources/ssl/blocking.js b/chrome/browser/resources/ssl/blocking.js
deleted file mode 100644
index 6442c38..0000000
--- a/chrome/browser/resources/ssl/blocking.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2013 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.
-
-function toggleMoreBox() {
-  var helpBoxOuter = $('help-box-outer');
-  helpBoxOuter.classList.toggle('hidden');
-  var moreLessButton = $('more-less-button');
-  if (helpBoxOuter.classList.contains('hidden')) {
-    moreLessButton.innerText = templateData.more;
-  } else {
-    moreLessButton.innerText = templateData.less;
-  }
-}
-
-function reloadPage() {
-  sendCommand(CMD_RELOAD);
-}
-
-function setupEvents() {
-  $('reload-button').addEventListener('click', reloadPage);
-  $('more-less-button').addEventListener('click', toggleMoreBox);
-}
-
-document.addEventListener('DOMContentLoaded', setupEvents);
diff --git a/chrome/browser/resources/ssl/interstitial_v2.css b/chrome/browser/resources/ssl/interstitial_v2.css
index 92ddccb..df3dd25 100644
--- a/chrome/browser/resources/ssl/interstitial_v2.css
+++ b/chrome/browser/resources/ssl/interstitial_v2.css
@@ -17,11 +17,6 @@ body.safe-browsing {
   color: white;
 }
 
-body.yellow {
-  background-color: rgb(255, 220, 59);
-  color: black;
-}
-
 button {
   background: rgb(76, 142, 250);
   border: 0;
@@ -159,14 +154,6 @@ input[type=checkbox] {
       url(images/2x/brokenssl_red.png) 2x);
 }
 
-.ssl-guard #icon {
-  background-image: -webkit-image-set(
-      url(images/1x/brokenssl_guard.png) 1x,
-      url(images/2x/brokenssl_guard.png) 2x);
-  height: 104px;
-  width: 94px;
-}
-
 .styled-checkbox {
   float: left;
   height: 16px;
diff --git a/chrome/browser/resources/ssl/interstitial_v2.js b/chrome/browser/resources/ssl/interstitial_v2.js
index 31ea103..ddfc5bc 100644
--- a/chrome/browser/resources/ssl/interstitial_v2.js
+++ b/chrome/browser/resources/ssl/interstitial_v2.js
@@ -13,7 +13,6 @@ 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 {
diff --git a/chrome/browser/resources/ssl/roadblock.html b/chrome/browser/resources/ssl/roadblock.html
deleted file mode 100644
index af1c1a3..0000000
--- a/chrome/browser/resources/ssl/roadblock.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html i18n-values="dir:textdirection">
-<head>
-  <meta charset="utf-8">
-  <title i18n-content="title"></title>
-  <style type="text/css">
-
-  html {
-    background-color: rgb(252, 195, 59);
-    height: 100%;
-  }
-
-  body {
-    font-family: Helvetica, Arial, sans-serif;
-    margin: 0;
-  }
-
-  .box {
-    -webkit-box-shadow: 3px 3px 8px #200;
-    background-color: white;
-    border-radius: 5px;
-    color: black;
-    font-size: 10pt;
-    line-height: 16pt;
-    margin: 40px auto auto auto;
-    max-width: 800px;
-    min-width: 500px;
-    padding: 20px;
-    position: relative;
-    width: 80%;
-  }
-
-  .main {
-    margin: 1em 80px;
-  }
-
-  .more {
-    border-top: 1px solid #ccc;
-    margin: 0 80px;
-    padding-top: 6px;
-  }
-
-  .more-info-title {
-    margin-left: 5px;
-    margin-right: 5px;
-  }
-
-  .more-link {
-    color: #0000FF;
-    cursor: pointer;
-    text-decoration: underline;
-  }
-
-  #roadblock-icon {
-    background-image: url('images/roadblock.png');
-    height: 53px;
-    position: absolute;
-    width: 64px;
-  }
-
-  .title {
-    color: #660000;
-    font-size: 18pt;
-    font-weight: bold;
-    line-height: 140%;
-    margin: 0 77px 6pt;
-  }
-
-  summary:focus {
-    outline: none;
-  }
-  </style>
-  <script src="../../../../ui/webui/resources/js/assert.js"></script>
-  <script src="ssl_errors_common.js"></script>
-  <script src="roadblock.js"></script>
-</head>
-<body>
-  <div class="box">
-    <div class="icon" id="roadblock-icon"></div>
-    <div class="title" i18n-content="headLine"></div>
-    <div class="main" i18n-values=".innerHTML:description;dir:textdirection"></div>
-    <div class="main" i18n-values=".innerHTML:reasonForNotProceeding"></div>
-    <div class="main">
-      <button i18n-content="proceed" id="proceed-button" hidden></button>
-      <button i18n-content="exit" id="exit-button"></button>
-    </div>
-    <details class="more">
-      <summary><span class="more-link" i18n-content="moreInfoTitle" id="more-info-title"></span></summary>
-      <p i18n-values=".innerHTML:moreInfo1"></p>
-      <p i18n-values=".innerHTML:moreInfo2"></p>
-      <p i18n-values=".innerHTML:moreInfo3"></p>
-      <p i18n-values=".innerHTML:moreInfo4"></p>
-      <p i18n-values=".innerHTML:moreInfo5"></p>
-    </details>
-  </div>
-</table>
-</body>
-</html>
diff --git a/chrome/browser/resources/ssl/roadblock.js b/chrome/browser/resources/ssl/roadblock.js
deleted file mode 100644
index f9c5860..0000000
--- a/chrome/browser/resources/ssl/roadblock.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2013 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.
-
-// UI modifications and event listeners that take place after load.
-function setupEvents() {
-  $('proceed-button').hidden = false;
-  $('proceed-button').addEventListener('click', function() {
-    sendCommand(CMD_PROCEED);
-  });
-
-  var details = document.querySelector('details.more');
-  if ($('more-info-title').textContent == '') {
-    details.hidden = true;
-  } else {
-    details.addEventListener('toggle', function handleToggle() {
-      if (!details.open)
-        return;
-      sendCommand(CMD_MORE);
-      details.removeEventListener('toggle', handleToggle);
-    }, false);
-  }
-
-  $('exit-button').addEventListener('click', function() {
-    sendCommand(CMD_DONT_PROCEED);
-  });
-}
-
-document.addEventListener('DOMContentLoaded', setupEvents);
diff --git a/chrome/browser/resources/ssl/ssl_errors_common.js b/chrome/browser/resources/ssl/ssl_errors_common.js
index 3712437..3c6ed55 100644
--- a/chrome/browser/resources/ssl/ssl_errors_common.js
+++ b/chrome/browser/resources/ssl/ssl_errors_common.js
@@ -44,10 +44,3 @@ function sharedSetup() {
 
 document.addEventListener('DOMContentLoaded', sharedSetup);
 
-// For the M37 Finch trial. https://crbug.com/386033
-function setupSSLFinchTrial() {
-  if (loadTimeData.getString('trialCondition') == 'V2Yellow')
-    $('body').classList.add('yellow');
-  else if (loadTimeData.getString('trialCondition') == 'V2WithGuard')
-    $('body').classList.add('ssl-guard');
-}
diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc
index 4244c30..d9cb002 100644
--- a/chrome/browser/ssl/ssl_blocking_page.cc
+++ b/chrome/browser/ssl/ssl_blocking_page.cc
@@ -72,41 +72,6 @@ using content::NavigationEntry;
 
 namespace {
 
-// Constants for the M37 Finch trial.
-const char kInterstitialTrialName[] = "SSLInterstitialVersion";
-const char kCondV1[] = "V1";
-const char kCondV1LayoutV2Text[] = "V1LayoutV2Text";
-const char kCondV2[] = "V2";  // Also the default.
-const char kCondV2Guard[] = "V2WithGuard";
-const char kCondV2Yellow[] = "V2Yellow";
-
-const char* GetTrialCondition() {
-  CommandLine* cli = CommandLine::ForCurrentProcess();
-  if (cli->HasSwitch(switches::kSSLInterstitialV1))
-    return kCondV1;
-  if (cli->HasSwitch(switches::kSSLInterstitialV2))
-    return kCondV2;
-  if (cli->HasSwitch(switches::kSSLInterstitialV1WithV2Text))
-    return kCondV1LayoutV2Text;
-  if (cli->HasSwitch(switches::kSSLInterstitialV2Guard))
-    return kCondV2Guard;
-  if (cli->HasSwitch(switches::kSSLInterstitialV2Yellow))
-    return kCondV2Yellow;
-
-  std::string name(base::FieldTrialList::FindFullName(kInterstitialTrialName));
-  if (name == kCondV1)
-    return kCondV1;
-  if (name == kCondV2)
-    return kCondV2;
-  if (name == kCondV1LayoutV2Text)
-    return kCondV1LayoutV2Text;
-  if (name == kCondV2Guard)
-    return kCondV2Guard;
-  if (name == kCondV2Yellow)
-    return kCondV2Yellow;
-  return kCondV2;
-}
-
 // Events for UMA. Do not reorder or change!
 enum SSLBlockingPageEvent {
   SHOW_ALL,
@@ -325,8 +290,7 @@ SSLBlockingPage::SSLBlockingPage(
       captive_portal_detection_enabled_(false),
       captive_portal_probe_completed_(false),
       captive_portal_no_response_(false),
-      captive_portal_detected_(false),
-      trial_condition_(GetTrialCondition()) {
+      captive_portal_detected_(false) {
   Profile* profile = Profile::FromBrowserContext(
       web_contents->GetBrowserContext());
   // For UMA stats.
@@ -392,187 +356,11 @@ void SSLBlockingPage::Show() {
 }
 
 std::string SSLBlockingPage::GetHTMLContents() {
-  if (trial_condition_ == kCondV1 || trial_condition_ == kCondV1LayoutV2Text)
-    return GetHTMLContentsV1();
-  return GetHTMLContentsV2();
-}
-
-std::string SSLBlockingPage::GetHTMLContentsV1() {
-  base::DictionaryValue strings;
-  int resource_id;
-  if (overridable_ && !strict_enforcement_) {
-    // Let's build the overridable error page.
-    SSLErrorInfo error_info =
-        SSLErrorInfo::CreateError(
-            SSLErrorInfo::NetErrorToErrorType(cert_error_),
-            ssl_info_.cert.get(),
-            request_url_);
-    resource_id = IDR_SSL_ROAD_BLOCK_HTML;
-    strings.SetString("textdirection", base::i18n::IsRTL() ? "rtl" : "ltr");
-    strings.SetString("errorType", "overridable");
-    if (trial_condition_ == kCondV1LayoutV2Text) {
-      base::string16 url(ASCIIToUTF16(request_url_.host()));
-      strings.SetString(
-          "headLine", l10n_util::GetStringUTF16(IDS_SSL_V2_HEADING));
-      strings.SetString(
-          "description",
-          l10n_util::GetStringFUTF16(IDS_SSL_V2_PRIMARY_PARAGRAPH, url));
-      strings.SetString(
-          "moreInfoTitle",
-          l10n_util::GetStringUTF16(IDS_SSL_V2_OPEN_DETAILS_BUTTON));
-      strings.SetString("moreInfo1", error_info.details());
-      strings.SetString("moreInfo2", base::string16());
-      strings.SetString("moreInfo3", base::string16());
-      strings.SetString("moreInfo4", base::string16());
-      strings.SetString("moreInfo5", base::string16());
-      strings.SetString(
-          "exit",
-          l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_SAFETY_BUTTON));
-      strings.SetString(
-          "title", l10n_util::GetStringUTF16(IDS_SSL_V2_TITLE));
-      strings.SetString(
-          "proceed",
-          l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_PROCEED_LINK_TEXT));
-      strings.SetString("reasonForNotProceeding", base::string16());
-    } else {
-      strings.SetString("headLine", error_info.title());
-      strings.SetString("description", error_info.details());
-      strings.SetString("moreInfoTitle",
-          l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXTRA_INFO_TITLE));
-      SetExtraInfo(&strings, error_info.extra_information());
-
-      strings.SetString(
-          "exit", l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_PAGE_EXIT));
-      strings.SetString(
-          "title", l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_PAGE_TITLE));
-      strings.SetString(
-          "proceed",
-          l10n_util::GetStringUTF16(IDS_SSL_OVERRIDABLE_PAGE_PROCEED));
-      strings.SetString("reasonForNotProceeding",
-          l10n_util::GetStringUTF16(
-              IDS_SSL_OVERRIDABLE_PAGE_SHOULD_NOT_PROCEED));
-    }
-  } else {
-    // Let's build the blocking error page.
-    resource_id = IDR_SSL_BLOCKING_HTML;
-
-    // Strings that are not dependent on the URL.
-    strings.SetString(
-        "title", l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_TITLE));
-    strings.SetString(
-        "reloadMsg", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_RELOAD));
-    strings.SetString(
-        "more", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_MORE));
-    strings.SetString(
-        "less", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_LESS));
-    strings.SetString(
-        "moreTitle",
-        l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_MORE_TITLE));
-    strings.SetString(
-        "techTitle",
-        l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_TECH_TITLE));
-
-    // Strings that are dependent on the URL.
-    base::string16 url(ASCIIToUTF16(request_url_.host()));
-    bool rtl = base::i18n::IsRTL();
-    strings.SetString("textDirection", rtl ? "rtl" : "ltr");
-    if (rtl)
-      base::i18n::WrapStringWithLTRFormatting(&url);
-    strings.SetString(
-        "headline", l10n_util::GetStringFUTF16(IDS_SSL_BLOCKING_PAGE_HEADLINE,
-                                               url.c_str()));
-    strings.SetString(
-        "message", l10n_util::GetStringFUTF16(IDS_SSL_BLOCKING_PAGE_BODY_TEXT,
-                                              url.c_str()));
-    strings.SetString(
-        "moreMessage",
-        l10n_util::GetStringFUTF16(IDS_SSL_BLOCKING_PAGE_MORE_TEXT,
-                                   url.c_str()));
-    strings.SetString("reloadUrl", request_url_.spec());
-
-    // Strings that are dependent on the error type.
-    SSLErrorInfo::ErrorType type =
-        SSLErrorInfo::NetErrorToErrorType(cert_error_);
-    base::string16 errorType;
-    if (type == SSLErrorInfo::CERT_REVOKED) {
-      errorType = base::string16(ASCIIToUTF16("Key revocation"));
-      strings.SetString(
-          "failure",
-          l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_REVOKED));
-    } else if (type == SSLErrorInfo::CERT_INVALID) {
-      errorType = base::string16(ASCIIToUTF16("Malformed certificate"));
-      strings.SetString(
-          "failure",
-          l10n_util::GetStringUTF16(IDS_SSL_BLOCKING_PAGE_FORMATTED));
-    } else if (type == SSLErrorInfo::CERT_PINNED_KEY_MISSING) {
-      errorType = base::string16(ASCIIToUTF16("Certificate pinning failure"));
-      strings.SetString(
-          "failure",
-          l10n_util::GetStringFUTF16(IDS_SSL_BLOCKING_PAGE_PINNING,
-                                     url.c_str()));
-    } else if (type == SSLErrorInfo::CERT_WEAK_KEY_DH) {
-      errorType = base::string16(ASCIIToUTF16("Weak DH public key"));
-      strings.SetString(
-          "failure",
-          l10n_util::GetStringFUTF16(IDS_SSL_BLOCKING_PAGE_WEAK_DH,
-                                     url.c_str()));
-    } else {
-      // HSTS failure.
-      errorType = base::string16(ASCIIToUTF16("HSTS failure"));
-      strings.SetString(
-          "failure",
-          l10n_util::GetStringFUTF16(IDS_SSL_BLOCKING_PAGE_HSTS, url.c_str()));
-    }
-    if (rtl)
-      base::i18n::WrapStringWithLTRFormatting(&errorType);
-    strings.SetString(
-        "errorType", l10n_util::GetStringFUTF16(IDS_SSL_BLOCKING_PAGE_ERROR,
-                                                errorType.c_str()));
-
-    // Strings that display the invalid cert.
-    base::string16 subject(
-        ASCIIToUTF16(ssl_info_.cert->subject().GetDisplayName()));
-    base::string16 issuer(
-        ASCIIToUTF16(ssl_info_.cert->issuer().GetDisplayName()));
-    std::string hashes;
-    for (std::vector<net::HashValue>::const_iterator it =
-            ssl_info_.public_key_hashes.begin();
-         it != ssl_info_.public_key_hashes.end();
-         ++it) {
-      base::StringAppendF(&hashes, "%s ", it->ToString().c_str());
-    }
-    base::string16 fingerprint(ASCIIToUTF16(hashes));
-    if (rtl) {
-      // These are always going to be LTR.
-      base::i18n::WrapStringWithLTRFormatting(&subject);
-      base::i18n::WrapStringWithLTRFormatting(&issuer);
-      base::i18n::WrapStringWithLTRFormatting(&fingerprint);
-    }
-    strings.SetString(
-        "subject", l10n_util::GetStringFUTF16(IDS_SSL_BLOCKING_PAGE_SUBJECT,
-                                              subject.c_str()));
-    strings.SetString(
-        "issuer", l10n_util::GetStringFUTF16(IDS_SSL_BLOCKING_PAGE_ISSUER,
-                                             issuer.c_str()));
-    strings.SetString(
-        "fingerprint",
-        l10n_util::GetStringFUTF16(IDS_SSL_BLOCKING_PAGE_HASHES,
-                                   fingerprint.c_str()));
-  }
-
-  base::StringPiece html(
-      ResourceBundle::GetSharedInstance().GetRawDataResource(
-          resource_id));
-  return webui::GetI18nTemplateHtml(html, &strings);
-}
-
-std::string SSLBlockingPage::GetHTMLContentsV2() {
   base::DictionaryValue load_time_data;
   base::string16 url(ASCIIToUTF16(request_url_.host()));
   if (base::i18n::IsRTL())
     base::i18n::WrapStringWithLTRFormatting(&url);
   webui::SetFontAndTextDirection(&load_time_data);
-  load_time_data.SetString("trialCondition", trial_condition_);
 
   // Shared values for both the overridable and non-overridable versions.
   load_time_data.SetBoolean("ssl", true);
diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h
index 06bce0a..009fdf9 100644
--- a/chrome/browser/ssl/ssl_blocking_page.h
+++ b/chrome/browser/ssl/ssl_blocking_page.h
@@ -86,11 +86,6 @@ class SSLBlockingPage : public content::InterstitialPageDelegate,
   void NotifyDenyCertificate();
   void NotifyAllowCertificate();
 
-  // These fetch the appropriate HTML page, depending on the
-  // SSLInterstitialVersion Finch trial.
-  std::string GetHTMLContentsV1();
-  std::string GetHTMLContentsV2();
-
   // Used to query the HistoryService to see if the URL is in history. For UMA.
   void OnGotHistoryCount(bool success, int num_visits, base::Time first_visit);
 
@@ -126,9 +121,6 @@ class SSLBlockingPage : public content::InterstitialPageDelegate,
   // Was a captive portal detected?
   bool captive_portal_detected_;
 
-  // For the FieldTrial: this contains the name of the condition.
-  std::string trial_condition_;
-
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 7b6e8cc..6801b15 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1131,13 +1131,6 @@ const char kSpellingServiceFeedbackUrl[] = "spelling-service-feedback-url";
 const char kSpellingServiceFeedbackIntervalSeconds[] =
     "spelling-service-feedback-interval-seconds";
 
-// Controls which version of the TLS/SSL interstitial is shown.
-const char kSSLInterstitialV1[]             = "ssl-interstitial-v1";
-const char kSSLInterstitialV2[]             = "ssl-interstitial-v2";
-const char kSSLInterstitialV1WithV2Text[]   = "ssl-interstitial-v1-v2-text";
-const char kSSLInterstitialV2Yellow[]       = "ssl-interstitial-v2-yellow";
-const char kSSLInterstitialV2Guard[]        = "ssl-interstitial-v2-guard";
-
 // Specifies the maximum SSL/TLS version ("ssl3", "tls1", "tls1.1", or
 // "tls1.2").
 const char kSSLVersionMax[]                 = "ssl-version-max";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 88f247e..e199ed7 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -314,11 +314,6 @@ extern const char kSimulateOutdated[];
 extern const char kSimulateOutdatedNoAU[];
 extern const char kSpellingServiceFeedbackUrl[];
 extern const char kSpellingServiceFeedbackIntervalSeconds[];
-extern const char kSSLInterstitialV1[];
-extern const char kSSLInterstitialV2[];
-extern const char kSSLInterstitialV1WithV2Text[];
-extern const char kSSLInterstitialV2Yellow[];
-extern const char kSSLInterstitialV2Guard[];
 extern const char kSSLVersionMax[];
 extern const char kSSLVersionMin[];
 extern const char kStartMaximized[];