Rename ct::CTPolicyCompliance::CT_POLICY_MAX to CT_POLICY_COUNT

"_MAX" suffix typically represents the last value in an enum, whereas
"_COUNT" is more commonly used to count the number of entries.

This CL should have no behavior changes.

Change-Id: I976c67473f9590a815514ac59758d3a7abc0ad8e
Reviewed-on: https://chromium-review.googlesource.com/1245022Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Commit-Queue: Kunihiko Sakamoto <ksakamoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594580}

chrome/browser/ssl/security_state_tab_helper.cc

@@ -148,7 +148,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
     UMA_HISTOGRAM_ENUMERATION(
         "Security.CertificateTransparency.MainFrameNavigationCompliance",
         entry->GetSSL().ct_policy_compliance,
-        net::ct::CTPolicyCompliance::CT_POLICY_MAX);
+        net::ct::CTPolicyCompliance::CT_POLICY_COUNT);
   }
 
   logged_http_warning_on_current_navigation_ = false;

components/certificate_transparency/chrome_ct_policy_enforcer.cc

@@ -87,7 +87,7 @@ const char* CTPolicyComplianceToString(CTPolicyCompliance status) {
     case CTPolicyCompliance::CT_POLICY_BUILD_NOT_TIMELY:
       return "BUILD_NOT_TIMELY";
     case CTPolicyCompliance::CT_POLICY_COMPLIANCE_DETAILS_NOT_AVAILABLE:
-    case CTPolicyCompliance::CT_POLICY_MAX:
+    case CTPolicyCompliance::CT_POLICY_COUNT:
       NOTREACHED();
       return "unknown";
   }

content/browser/devtools/protocol/network_handler.cc

@@ -102,7 +102,7 @@ Network::CertificateTransparencyCompliance SerializeCTPolicyCompliance(
     case net::ct::CTPolicyCompliance::
         CT_POLICY_COMPLIANCE_DETAILS_NOT_AVAILABLE:
       return Network::CertificateTransparencyComplianceEnum::Unknown;
-    case net::ct::CTPolicyCompliance::CT_POLICY_MAX:
+    case net::ct::CTPolicyCompliance::CT_POLICY_COUNT:
       NOTREACHED();
       return Network::CertificateTransparencyComplianceEnum::Unknown;
   }

content/browser/web_package/signed_exchange_handler.cc

@@ -524,7 +524,7 @@ void SignedExchangeHandler::OnVerifyCert(
   base::UmaHistogramSparse(kHistogramCertVerificationResult, -error_code);
   UMA_HISTOGRAM_ENUMERATION(kHistogramCTVerificationResult,
                             ct_result.policy_compliance,
-                            net::ct::CTPolicyCompliance::CT_POLICY_MAX);
+                            net::ct::CTPolicyCompliance::CT_POLICY_COUNT);
 
   if (error_code != net::OK) {
     SignedExchangeLoadResult result;

net/cert/ct_policy_status.h

@@ -27,7 +27,7 @@ enum class CTPolicyCompliance {
   // Compliance details for the connection are not available, e.g. because a
   // resource was loaded from disk cache.
   CT_POLICY_COMPLIANCE_DETAILS_NOT_AVAILABLE = 4,
-  CT_POLICY_MAX
+  CT_POLICY_COUNT
 };
 
 }  // namespace ct

net/http/transport_security_state.cc

@@ -501,7 +501,7 @@ TransportSecurityState::CheckCTRequirements(
   if (IsDynamicExpectCTEnabled() && GetDynamicExpectCTState(hostname, &state)) {
     UMA_HISTOGRAM_ENUMERATION(
         "Net.ExpectCTHeader.PolicyComplianceOnConnectionSetup",
-        policy_compliance, ct::CTPolicyCompliance::CT_POLICY_MAX);
+        policy_compliance, ct::CTPolicyCompliance::CT_POLICY_COUNT);
     if (!complies && expect_ct_reporter_ && !state.report_uri.is_empty() &&
         report_status == ENABLE_EXPECT_CT_REPORTS) {
       MaybeNotifyExpectCTFailed(host_port_pair, state.report_uri, state.expiry,
@@ -1106,7 +1106,7 @@ void TransportSecurityState::ProcessExpectCTHeader(
     return;
   UMA_HISTOGRAM_ENUMERATION(
       "Net.ExpectCTHeader.PolicyComplianceOnHeaderProcessing",
-      ssl_info.ct_policy_compliance, ct::CTPolicyCompliance::CT_POLICY_MAX);
+      ssl_info.ct_policy_compliance, ct::CTPolicyCompliance::CT_POLICY_COUNT);
   if (ssl_info.ct_policy_compliance !=
       ct::CTPolicyCompliance::CT_POLICY_COMPLIES_VIA_SCTS) {
     // If an Expect-CT header is observed over a non-compliant connection, the

net/quic/crypto/proof_verifier_chromium.cc

@@ -412,7 +412,7 @@ int ProofVerifierChromium::Job::DoVerifyCertComplete(int result) {
         UMA_HISTOGRAM_ENUMERATION(
             "Net.CertificateTransparency.EVCompliance2.QUIC",
             verify_details_->ct_verify_result.policy_compliance,
-            ct::CTPolicyCompliance::CT_POLICY_MAX);
+            ct::CTPolicyCompliance::CT_POLICY_COUNT);
       }
     }
 
@@ -422,7 +422,7 @@ int ProofVerifierChromium::Job::DoVerifyCertComplete(int result) {
       UMA_HISTOGRAM_ENUMERATION(
           "Net.CertificateTransparency.ConnectionComplianceStatus2.QUIC",
           verify_details_->ct_verify_result.policy_compliance,
-          ct::CTPolicyCompliance::CT_POLICY_MAX);
+          ct::CTPolicyCompliance::CT_POLICY_COUNT);
     }
 
     int ct_result = OK;
@@ -446,7 +446,7 @@ int ProofVerifierChromium::Job::DoVerifyCertComplete(int result) {
             "Net.CertificateTransparency.CTRequiredConnectionComplianceStatus2."
             "QUIC",
             verify_details_->ct_verify_result.policy_compliance,
-            ct::CTPolicyCompliance::CT_POLICY_MAX);
+            ct::CTPolicyCompliance::CT_POLICY_COUNT);
       }
     } else {
       verify_details_->ct_verify_result.policy_compliance_required = false;

net/socket/ssl_client_socket_impl.cc

@@ -1547,7 +1547,7 @@ int SSLClientSocketImpl::VerifyCT() {
     if (server_cert_verify_result_.is_issued_by_known_root) {
       UMA_HISTOGRAM_ENUMERATION("Net.CertificateTransparency.EVCompliance2.SSL",
                                 ct_verify_result_.policy_compliance,
-                                ct::CTPolicyCompliance::CT_POLICY_MAX);
+                                ct::CTPolicyCompliance::CT_POLICY_COUNT);
     }
   }
 
@@ -1557,7 +1557,7 @@ int SSLClientSocketImpl::VerifyCT() {
     UMA_HISTOGRAM_ENUMERATION(
         "Net.CertificateTransparency.ConnectionComplianceStatus2.SSL",
         ct_verify_result_.policy_compliance,
-        ct::CTPolicyCompliance::CT_POLICY_MAX);
+        ct::CTPolicyCompliance::CT_POLICY_COUNT);
   }
 
   TransportSecurityState::CTRequirementsStatus ct_requirement_status =
@@ -1578,7 +1578,7 @@ int SSLClientSocketImpl::VerifyCT() {
           "Net.CertificateTransparency.CTRequiredConnectionComplianceStatus2."
           "SSL",
           ct_verify_result_.policy_compliance,
-          ct::CTPolicyCompliance::CT_POLICY_MAX);
+          ct::CTPolicyCompliance::CT_POLICY_COUNT);
     }
   } else {
     ct_verify_result_.policy_compliance_required = false;

net/url_request/url_request_http_job.cc

@@ -131,7 +131,7 @@ void RecordCTHistograms(const net::SSLInfo& ssl_info) {
   UMA_HISTOGRAM_ENUMERATION(
       "Net.CertificateTransparency.RequestComplianceStatus",
       ssl_info.ct_policy_compliance,
-      net::ct::CTPolicyCompliance::CT_POLICY_MAX);
+      net::ct::CTPolicyCompliance::CT_POLICY_COUNT);
   // Record the CT compliance of each request which was required to be CT
   // compliant. This gives a picture of the sites that are supposed to be
   // compliant and how well they do at actually being compliant.
@@ -139,7 +139,7 @@ void RecordCTHistograms(const net::SSLInfo& ssl_info) {
     UMA_HISTOGRAM_ENUMERATION(
         "Net.CertificateTransparency.CTRequiredRequestComplianceStatus",
         ssl_info.ct_policy_compliance,
-        net::ct::CTPolicyCompliance::CT_POLICY_MAX);
+        net::ct::CTPolicyCompliance::CT_POLICY_COUNT);
   }
 }
 

third_party/blink/renderer/platform/exported/web_url_response.cc

@@ -249,7 +249,7 @@ void WebURLResponse::SetCTPolicyCompliance(
       resource_response_->SetCTPolicyCompliance(
           ResourceResponse::kCTPolicyComplies);
       break;
-    case net::ct::CTPolicyCompliance::CT_POLICY_MAX:
+    case net::ct::CTPolicyCompliance::CT_POLICY_COUNT:
       NOTREACHED();
       resource_response_->SetCTPolicyCompliance(
           ResourceResponse::kCTPolicyComplianceDetailsNotAvailable);