Deprecate old PublicKeyPinFailureDomain histogram

net/http/transport_security_state.cc

Index: net/http/transport_security_state.cc
diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc
index 9ec992572ab7abcdad5b82da39a6f7eb2f1b5aba..4b3691d41159fe058c3ed5c25bc401cfe4242ab8 100644
--- a/net/http/transport_security_state.cc
+++ b/net/http/transport_security_state.cc
@@ -392,7 +392,6 @@ class HuffmanDecoder {
 // data.
 struct PreloadResult {
   uint32_t pinset_id;
-  uint32_t domain_id;
   // hostname_offset contains the number of bytes from the start of the given
   // hostname where the name of the matching entry starts.
   size_t hostname_offset;
@@ -524,8 +523,9 @@ bool DecodeHSTSPreloadRaw(const std::string& search_hostname,
         tmp.pkp_include_subdomains = tmp.sts_include_subdomains;
 
         if (tmp.has_pins) {
+          uint32_t unused_domain_id;
           if (!reader.Read(4, &tmp.pinset_id) ||
-              !reader.Read(9, &tmp.domain_id) ||
+              !reader.Read(9, &unused_domain_id) ||

[davidben, 2016/11/01 17:20:22]

Could you file a bug to get rid of this and link it here? (Maybe for lgarron
since he's managing the list.) I'm not familiar enough with the format to know
if it'd make it more compact, but freeing up 9 bits seems valuable.

[estark, 2016/11/01 17:25:47]

Done (bug 661206).

               (!tmp.sts_include_subdomains &&
                !reader.Next(&tmp.pkp_include_subdomains))) {
             return false;
@@ -778,10 +778,6 @@ TransportSecurityState::PKPStatus TransportSecurityState::CheckPublicKeyPins(
   if (!is_issued_by_known_root)
     return pin_validity;
 
-  if (pin_validity == PKPStatus::VIOLATED) {
-    LOG(ERROR) << *pinning_failure_log;
-    ReportUMAOnPinFailure(host_port_pair.host());
-  }
   UMA_HISTOGRAM_BOOLEAN("Net.PublicKeyPinSuccess",
                         pin_validity == PKPStatus::OK);
   return pin_validity;
@@ -1354,20 +1350,6 @@ void TransportSecurityState::ProcessExpectCTHeader(
 }
 
 // static
-void TransportSecurityState::ReportUMAOnPinFailure(const std::string& host) {
-  PreloadResult result;
-  if (!DecodeHSTSPreload(host, &result) ||
-      !result.has_pins) {
-    return;
-  }
-
-  DCHECK(result.domain_id != DOMAIN_NOT_PINNED);
-
-  UMA_HISTOGRAM_SPARSE_SLOWLY(
-      "Net.PublicKeyPinFailureDomain", result.domain_id);
-}
-
-// static
 void TransportSecurityState::SetShouldRequireCTForTesting(bool* required) {
   if (!required) {
     g_ct_required_for_testing = 0;