Add Symantec URL to ConnectionHelpTabHelper

After crrev.com/c/1262637 interstiitals will link to a different
support URL for Symantec errors, check against that one too in
ConnectionHelpTabHelper.

Change-Id: I1318534ad3db2235b1e8f5f383d7c69ad74db65c
Reviewed-on: https://chromium-review.googlesource.com/c/1265081Reviewed-by: Christopher Thompson <cthomp@chromium.org>
Commit-Queue: Carlos IL <carlosil@chromium.org>
Cr-Commit-Position: refs/heads/master@{#597250}

chrome/browser/ssl/connection_help_tab_helper.cc

@@ -6,6 +6,7 @@
 
 #include "base/feature_list.h"
 #include "base/metrics/histogram_macros.h"
+#include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_features.h"
 #include "content/public/browser/navigation_handle.h"
@@ -35,10 +36,8 @@ void MaybeRedirectToBundledHelp(content::WebContents* web_contents) {
 ConnectionHelpTabHelper::~ConnectionHelpTabHelper() {}
 
 void ConnectionHelpTabHelper::DidAttachInterstitialPage() {
-  GURL::Replacements replacements;
-  replacements.ClearRef();
-  if (web_contents()->GetURL().ReplaceComponents(replacements) ==
-      GetHelpCenterURL()) {
+  if (web_contents()->GetURL().EqualsIgnoringRef(GetHelpCenterURL()) ||
+      web_contents()->GetURL().EqualsIgnoringRef(GURL(kSymantecSupportUrl))) {
     UMA_HISTOGRAM_ENUMERATION(
         "SSL.CertificateErrorHelpCenterVisited",
         ConnectionHelpTabHelper::LearnMoreClickResult::kFailedWithInterstitial,
@@ -49,11 +48,9 @@ void ConnectionHelpTabHelper::DidAttachInterstitialPage() {
 
 void ConnectionHelpTabHelper::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
-  GURL::Replacements replacements;
-  replacements.ClearRef();
   if (navigation_handle->IsInMainFrame() &&
-      web_contents()->GetURL().ReplaceComponents(replacements) ==
-          GetHelpCenterURL()) {
+      (web_contents()->GetURL().EqualsIgnoringRef(GetHelpCenterURL()) ||
+       web_contents()->GetURL().EqualsIgnoringRef(GURL(kSymantecSupportUrl)))) {
     LearnMoreClickResult histogram_value;
     if (navigation_handle->IsErrorPage()) {
       if (base::FeatureList::IsEnabled(features::kSSLCommittedInterstitials) &&

chrome/browser/ssl/ssl_blocking_page.cc

@@ -45,9 +45,6 @@ using security_interstitials::SSLErrorUI;
 
 namespace {
 
-const char kSymantecSupportUrl[] =
-    "https://support.google.com/chrome?p=symantec";
-
 std::unique_ptr<ChromeMetricsHelper> CreateSslProblemMetricsHelper(
     content::WebContents* web_contents,
     int cert_error,

chrome/browser/ssl/ssl_blocking_page.h

@@ -32,6 +32,13 @@ class SSLErrorUI;
 
 class ChromeMetricsHelper;
 
+// URL to use as the 'Learn More' link when the interstitial is caused by
+// a "ERR_CERT_SYMANTEC_LEGACY" error, -202 fragment is included so
+// chrome://connection-help expands the right section if the user can't reach
+// the help center.
+const char kSymantecSupportUrl[] =
+    "https://support.google.com/chrome?p=symantec#-202";
+
 // This class is responsible for showing/hiding the interstitial page that is
 // shown when a certificate error happens.
 // It deletes itself when the interstitial page is closed.