Fixed typo in kHelpCenterConnectionHelpUrl

Removed extra slash from help center URL, also updated the histogram
enum to match the recommendation in base/metrics/histogram_macros.h

Bug: 853897

Change-Id: Ie6372e1b535ae50d468680842e2213c9c404cbb0
Reviewed-on: https://chromium-review.googlesource.com/1104959
Commit-Queue: Carlos IL <carlosil@chromium.org>
Reviewed-by: Emily Stark <estark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568160}

chrome/browser/ssl/connection_help_tab_helper.cc

@@ -18,7 +18,7 @@
 
 namespace {
 const char kHelpCenterConnectionHelpUrl[] =
-    "https://support.google.com/chrome/answer/6098869/";
+    "https://support.google.com/chrome/answer/6098869";
 const char kBundledConnectionHelpUrl[] = "chrome://connection-help";
 
 void MaybeRedirectToBundledHelp(content::WebContents* web_contents) {
@@ -55,7 +55,8 @@ void ConnectionHelpTabHelper::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   GURL::Replacements replacements;
   replacements.ClearRef();
-  if (web_contents()->GetURL().ReplaceComponents(replacements) ==
+  if (navigation_handle->IsInMainFrame() &&
+      web_contents()->GetURL().ReplaceComponents(replacements) ==
           GetHelpCenterURL()) {
     LearnMoreClickResult histogram_value;
     if (navigation_handle->IsErrorPage()) {

chrome/browser/ssl/connection_help_tab_helper.h

@@ -29,7 +29,7 @@ class ConnectionHelpTabHelper
     kSucceeded = 0,
     kFailedWithInterstitial = 1,
     kFailedOther = 2,
-    kLearnMoreResultCount = 3
+    kLearnMoreResultCount = kFailedOther
   };
 
   ~ConnectionHelpTabHelper() override;