Revert 153076 - Accidentally added unreviewed code into the CL.

chrome/common/localized_error.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/common/localized_error.h"
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
@@ skipping 17 matching lines @@
 
 using WebKit::WebURLError;
 
 namespace {
 
 static const char kRedirectLoopLearnMoreUrl[] =
     "https://www.google.com/support/chrome/bin/answer.py?answer=95626";
 static const char kWeakDHKeyLearnMoreUrl[] =
     "http://sites.google.com/a/chromium.org/dev/"
     "err_ssl_weak_server_ephemeral_dh_key";
+static const char kESETLearnMoreUrl[] =
+    "http://kb.eset.com/esetkb/index?page=content&id=SOLN2588";
 #if defined(OS_CHROMEOS)
 static const char kAppWarningLearnMoreUrl[] =
     "chrome-extension://honijodknafkokifofgiaalefdiedpko/main.html"
     "?answer=1721911";
 #endif  // defined(OS_CHROMEOS)
 
 enum NAV_SUGGESTIONS {
   SUGGEST_NONE     = 0,
   SUGGEST_RELOAD   = 1 << 0,
   SUGGEST_HOSTNAME = 1 << 1,
@@ skipping 195 matching lines @@
    IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT,
    SUGGEST_NONE,
   },
   {net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY,
    IDS_ERRORPAGES_TITLE_LOAD_FAILED,
    IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY,
    IDS_ERRORPAGES_SUMMARY_WEAK_SERVER_EPHEMERAL_DH_KEY,
    IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
    SUGGEST_LEARNMORE,
   },
+  {net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
+   IDS_ERRORPAGES_TITLE_LOAD_FAILED,
+   IDS_ERRORPAGES_HEADING_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
+   IDS_ERRORPAGES_SUMMARY_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
+   IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
+   SUGGEST_LEARNMORE,
+  },
   {net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN,
    IDS_ERRORPAGES_TITLE_LOAD_FAILED,
    IDS_ERRORPAGES_HEADING_PINNING_FAILURE,
    IDS_ERRORPAGES_SUMMARY_PINNING_FAILURE,
    IDS_ERRORPAGES_DETAILS_PINNING_FAILURE,
    SUGGEST_NONE,
   },
   {net::ERR_TEMPORARILY_THROTTLED,
    IDS_ERRORPAGES_TITLE_ACCESS_DENIED,
    IDS_ERRORPAGES_HEADING_ACCESS_DENIED,
@@ skipping 223 matching lines @@
   error_strings->SetString("heading",
       l10n_util::GetStringUTF16(options.heading_resource_id));
 
   DictionaryValue* summary = new DictionaryValue;
   summary->SetString("msg",
       l10n_util::GetStringUTF16(options.summary_resource_id));
   // TODO(tc): We want the unicode url and host here since they're being
   //           displayed.
   summary->SetString("failedUrl", failed_url_string);
   summary->SetString("hostName", failed_url.host());
+  summary->SetString("productName",
+                     l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   error_strings->Set("summary", summary);
 
   string16 details = l10n_util::GetStringUTF16(options.details_resource_id);
   error_strings->SetString("details",
       GetErrorDetailsString(error_domain, error_code, details));
 
   // Platform specific instructions for diagnosing network issues on OSX and
   // Windows.
 #if defined(OS_MACOSX) || defined(OS_WIN)
   if (error_domain == net::kErrorDomain &&
@@ skipping 70 matching lines @@
         l10n_util::GetStringUTF16(
             IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION));
     error_strings->Set("suggestionsDisableNetworkPrediction",
                        suggest_network_prediction);
   }
 
   if (options.suggestions & SUGGEST_FIREWALL_CONFIG) {
     DictionaryValue* suggest_firewall_config = new DictionaryValue;
     suggest_firewall_config->SetString("msg",
         l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG));
+    suggest_firewall_config->SetString("productName",
+        l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
     error_strings->Set("suggestionsFirewallConfig", suggest_firewall_config);
   }
 
   if (options.suggestions & SUGGEST_PROXY_CONFIG) {
 #if defined(OS_CHROMEOS)
     DictionaryValue* suggest_proxy_config = new DictionaryValue();
 #else
     DictionaryValue* suggest_proxy_config = GetStandardMenuItemsText();
 #endif  // defined(OS_CHROMEOS)
     suggest_proxy_config->SetString("msg",
@@ skipping 29 matching lines @@
 
   if (options.suggestions & SUGGEST_LEARNMORE) {
     GURL learn_more_url;
     switch (options.error_code) {
       case net::ERR_TOO_MANY_REDIRECTS:
         learn_more_url = GURL(kRedirectLoopLearnMoreUrl);
         break;
       case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY:
         learn_more_url = GURL(kWeakDHKeyLearnMoreUrl);
         break;
+      case net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION:
+        learn_more_url = GURL(kESETLearnMoreUrl);
+        break;
       default:
         break;
     }
 
     if (learn_more_url.is_valid()) {
       // Add the language parameter to the URL.
       std::string query = learn_more_url.query() + "&hl=" + locale;
       GURL::Replacements repl;
       repl.SetQueryStr(query);
       learn_more_url = learn_more_url.ReplaceComponents(repl);
@@ skipping 70 matching lines @@
 #if defined(OS_CHROMEOS)
   GURL learn_more_url(kAppWarningLearnMoreUrl);
   DictionaryValue* suggest_learn_more = new DictionaryValue();
   suggest_learn_more->SetString("msg",
                                 l10n_util::GetStringUTF16(
                                     IDS_ERRORPAGES_SUGGESTION_LEARNMORE));
   suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
   error_strings->Set("suggestionsLearnMore", suggest_learn_more);
 #endif  // defined(OS_CHROMEOS)
 }