Split out recurrent error metrics for CT errors specifically

This will allow us to see whether the recurrent interstitial message affects CTR
for CT errors specifically (rather than lumping them in with Symantec distrust
errors, which can also trigger the recurrent error message).

Bug: 839969
Change-Id: I04764573c6f225ab25c61fb268983f02f38fdc3f
Reviewed-on: https://chromium-review.googlesource.com/1136717Reviewed-by: Christopher Thompson <cthomp@chromium.org>
Reviewed-by: Robert Kaplow (slow) <rkaplow@chromium.org>
Commit-Queue: Emily Stark <estark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575056}

chrome/browser/ssl/ssl_blocking_page.cc

@@ -95,9 +95,19 @@ SSLBlockingPage* SSLBlockingPage::Create(
   if (overridable) {
     UMA_HISTOGRAM_BOOLEAN("interstitial.ssl_overridable.is_recurrent_error",
                           is_recurrent_error);
+    if (cert_error == net::ERR_CERTIFICATE_TRANSPARENCY_REQUIRED) {
+      UMA_HISTOGRAM_BOOLEAN(
+          "interstitial.ssl_overridable.is_recurrent_error.ct_error",
+          is_recurrent_error);
+    }
   } else {
     UMA_HISTOGRAM_BOOLEAN("interstitial.ssl_nonoverridable.is_recurrent_error",
                           is_recurrent_error);
+    if (cert_error == net::ERR_CERTIFICATE_TRANSPARENCY_REQUIRED) {
+      UMA_HISTOGRAM_BOOLEAN(
+          "interstitial.ssl_nonoverridable.is_recurrent_error.ct_error",
+          is_recurrent_error);
+    }
   }
 
   return new SSLBlockingPage(web_contents, cert_error, ssl_info, request_url,

chrome/browser/ssl/ssl_error_controller_client.cc

@@ -53,8 +53,13 @@ using content::Referrer;
 namespace {
 
 void RecordRecurrentErrorAction(
-    SSLErrorControllerClient::RecurrentErrorAction action) {
+    SSLErrorControllerClient::RecurrentErrorAction action,
+    int cert_error) {
   UMA_HISTOGRAM_ENUMERATION("interstitial.ssl_recurrent_error.action", action);
+  if (cert_error == net::ERR_CERTIFICATE_TRANSPARENCY_REQUIRED) {
+    UMA_HISTOGRAM_ENUMERATION(
+        "interstitial.ssl_recurrent_error.ct_error.action", action);
+  }
 }
 
 bool HasSeenRecurrentErrorInternal(content::WebContents* web_contents,
@@ -164,7 +169,7 @@ SSLErrorControllerClient::SSLErrorControllerClient(
       request_url_(request_url),
       cert_error_(cert_error) {
   if (HasSeenRecurrentErrorInternal(web_contents_, cert_error_)) {
-    RecordRecurrentErrorAction(RecurrentErrorAction::kShow);
+    RecordRecurrentErrorAction(RecurrentErrorAction::kShow, cert_error_);
   }
 }
 
@@ -181,7 +186,7 @@ void SSLErrorControllerClient::GoBack() {
 
 void SSLErrorControllerClient::Proceed() {
   if (HasSeenRecurrentErrorInternal(web_contents_, cert_error_)) {
-    RecordRecurrentErrorAction(RecurrentErrorAction::kProceed);
+    RecordRecurrentErrorAction(RecurrentErrorAction::kProceed, cert_error_);
   }
 
   MaybeTriggerSecurityInterstitialProceededEvent(web_contents_, request_url_,

tools/metrics/histograms/histograms.xml

@@ -36540,6 +36540,17 @@ uploading your change for review.
   </summary>
 </histogram>
 
+<histogram name="interstitial.ssl_nonoverridable.is_recurrent_error.ct_error"
+    enum="BooleanRecurrentError" expires_after="M71">
+  <owner>estark@chromium.org</owner>
+  <summary>
+    Recorded when a non-overridable SSL interstitial is shown for a Certificate
+    Transparency error. The value is true if the user has seen the same error
+    multiple times (in which case a special message is added to the
+    interstitial).
+  </summary>
+</histogram>
+
 <histogram name="interstitial.ssl_overridable.is_recurrent_error"
     enum="BooleanRecurrentError" expires_after="M71">
   <owner>estark@chromium.org</owner>
@@ -36550,6 +36561,17 @@ uploading your change for review.
   </summary>
 </histogram>
 
+<histogram name="interstitial.ssl_overridable.is_recurrent_error.ct_error"
+    enum="BooleanRecurrentError" expires_after="M71">
+  <owner>estark@chromium.org</owner>
+  <summary>
+    Recorded when an overridable SSL interstitial is shown for a Certificate
+    Transparency error. The value is true if the user has seen the same error
+    multiple times (in which case a special message is added to the
+    interstitial).
+  </summary>
+</histogram>
+
 <histogram name="interstitial.ssl_recurrent_error.action"
     enum="RecurrentErrorAction" expires_after="M71">
   <owner>estark@chromium.org</owner>
@@ -36560,6 +36582,16 @@ uploading your change for review.
   </summary>
 </histogram>
 
+<histogram name="interstitial.ssl_recurrent_error.ct_error.action"
+    enum="RecurrentErrorAction" expires_after="M71">
+  <owner>estark@chromium.org</owner>
+  <summary>
+    Recorded whenever the user sees or proceeds through an SSL interstitial for
+    a Certificate Transparency error that the user has seen multiple times (in
+    which case a special message is added to the interstitial).
+  </summary>
+</histogram>
+
 <histogram name="interstitial.ssl_reject_time" units="ms">
   <obsolete>
     Removed on 8/1/13.