Certificate Transparency: Add UMA for whitelist status

net/cert/cert_policy_enforcer.cc

 // Copyright 2014 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 "net/cert/cert_policy_enforcer.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/build_time.h"
@@ skipping 108 matching lines @@
     case CT_ENOUGH_SCTS:
       return "ENOUGH_SCTS";
       break;
     case CT_COMPLIANCE_MAX:
       break;
   }
 
   return "unknown";
 }
 
-void LogCTComplianceStatusToUMA(CTComplianceStatus status) {
+enum EVWhitelistStatus {
+  EV_WHITELIST_NOT_PRESENT = 0,
+  EV_WHITELIST_INVALID = 1,
+  EV_WHITELIST_VALID = 2,
+  EV_WHITELIST_MAX,
+};
+
+void LogCTComplianceStatusToUMA(CTComplianceStatus status,
+                                const ct::EVCertsWhitelist* ev_whitelist) {
   UMA_HISTOGRAM_ENUMERATION("Net.SSL_EVCertificateCTCompliance", status,
                             CT_COMPLIANCE_MAX);
+  if (status == CT_NOT_COMPLIANT) {
+    EVWhitelistStatus ev_whitelist_status = EV_WHITELIST_NOT_PRESENT;
+    if (ev_whitelist != NULL) {
+      if (ev_whitelist->IsValid())
+        ev_whitelist_status = EV_WHITELIST_VALID;
+      else
+        ev_whitelist_status = EV_WHITELIST_INVALID;
+    }
+
+    UMA_HISTOGRAM_ENUMERATION("Net.SSL_EVWhitelistValidityForNonCompliantCert",
+                              ev_whitelist_status, EV_WHITELIST_MAX);
+  }
 }
 
 struct ComplianceDetails {
   ComplianceDetails()
       : ct_presence_required(false),
         build_timely(false),
         status(CT_NOT_COMPLIANT) {}
 
   // Whether enforcement of the policy was required or not.
   bool ct_presence_required;
@@ skipping 95 matching lines @@
 
   net_log.AddEvent(NetLog::TYPE_EV_CERT_CT_COMPLIANCE_CHECKED,
                    net_log_callback);
 
   if (!details.ct_presence_required)
     return true;
 
   if (!details.build_timely)
     return false;
 
-  LogCTComplianceStatusToUMA(details.status);
+  LogCTComplianceStatusToUMA(details.status, ev_whitelist);
 
   if (details.status == CT_IN_WHITELIST || details.status == CT_ENOUGH_SCTS)
     return true;
 
   return false;
 }
 
 }  // namespace net