Refine NetworkTimeTracker histograms

components/ssl_errors/error_classification.cc

 // Copyright 2015 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 "components/ssl_errors/error_classification.h"
 
 #include <limits.h>
 #include <stddef.h>
 
 #include <vector>
@@ skipping 24 matching lines @@
 using base::TimeTicks;
 using base::TimeDelta;
 
 namespace ssl_errors {
 namespace {
 
 // Describes the result of getting network time and if it was
 // unavailable, why it was unavailable. This enum is being histogrammed
 // so do not reorder or remove values.
 enum NetworkClockState {
-  // The clock state relative to network time is unknown because the
-  // NetworkTimeTracker has no information from the network.
-  NETWORK_CLOCK_STATE_UNKNOWN_NO_SYNC = 0,
+  // Value 0 was NETWORK_CLOCK_STATE_UNKNOWN_NO_SYNC, which is obsolete
+  // in favor of the finer-grained values below.
+
   // The clock state relative to network time is unknown because the
   // user's clock has fallen out of sync with the latest information
   // from the network (due to e.g. suspend/resume).
-  NETWORK_CLOCK_STATE_UNKNOWN_SYNC_LOST,
+  NETWORK_CLOCK_STATE_UNKNOWN_SYNC_LOST = 1,
   // The clock is "close enough" to the network time.
   NETWORK_CLOCK_STATE_OK,
   // The clock is in the past relative to network time.
   NETWORK_CLOCK_STATE_CLOCK_IN_PAST,
   // The clock is in the future relative to network time.
   NETWORK_CLOCK_STATE_CLOCK_IN_FUTURE,
+  // The clock state relative to network time is unknown because no sync
+  // attempt has been made yet.
+  NETWORK_CLOCK_STATE_UNKNOWN_NO_SYNC_ATTEMPT,
+  // The clock state relative to network time is unknown because one or
+  // more sync attempts has failed.
+  NETWORK_CLOCK_STATE_UNKNOWN_NO_SUCCESSFUL_SYNC,
+  // The clock state relative to network time is unknown because the
+  // first sync attempt is still pending.
+  NETWORK_CLOCK_STATE_UNKNOWN_FIRST_SYNC_PENDING,
+  // The clock state relative to network time is unknown because one or
+  // more time query attempts have failed, and a subsequent sync attempt
+  // is still pending.
+  NETWORK_CLOCK_STATE_UNKNOWN_SUBSEQUENT_SYNC_PENDING,
   NETWORK_CLOCK_STATE_MAX
 };
 
 // Events for UMA. Do not reorder or change!
 enum SSLInterstitialCause {
   CLOCK_PAST,
   CLOCK_FUTURE,
   WWW_SUBDOMAIN_MATCH,
   SUBDOMAIN_MATCH,
   SUBDOMAIN_INVERSE_MATCH,
@@ skipping 168 matching lines @@
         network_state = NETWORK_CLOCK_STATE_CLOCK_IN_PAST;
       } else if (now_system > now_network + uncertainty + kNetworkTimeFudge) {
         network_state = NETWORK_CLOCK_STATE_CLOCK_IN_FUTURE;
       } else {
         network_state = NETWORK_CLOCK_STATE_OK;
       }
       break;
     case network_time::NetworkTimeTracker::NETWORK_TIME_SYNC_LOST:
       network_state = NETWORK_CLOCK_STATE_UNKNOWN_SYNC_LOST;
       break;
-    case network_time::NetworkTimeTracker::NETWORK_TIME_NO_SYNC:
-      network_state = NETWORK_CLOCK_STATE_UNKNOWN_NO_SYNC;
+    case network_time::NetworkTimeTracker::NETWORK_TIME_NO_SYNC_ATTEMPT:
+      network_state = NETWORK_CLOCK_STATE_UNKNOWN_NO_SYNC_ATTEMPT;
+      break;
+    case network_time::NetworkTimeTracker::NETWORK_TIME_NO_SUCCESSFUL_SYNC:
+      network_state = NETWORK_CLOCK_STATE_UNKNOWN_NO_SUCCESSFUL_SYNC;
+      break;
+    case network_time::NetworkTimeTracker::NETWORK_TIME_FIRST_SYNC_PENDING:
+      network_state = NETWORK_CLOCK_STATE_UNKNOWN_FIRST_SYNC_PENDING;
+      break;
+    case network_time::NetworkTimeTracker::NETWORK_TIME_SUBSEQUENT_SYNC_PENDING:
+      network_state = NETWORK_CLOCK_STATE_UNKNOWN_SUBSEQUENT_SYNC_PENDING;
       break;
   }
 
   ClockState build_time_state = CLOCK_STATE_UNKNOWN;
   base::Time build_time = g_testing_build_time.Get().is_null()
                               ? base::GetBuildTime()
                               : g_testing_build_time.Get();
   if (now_system < build_time - base::TimeDelta::FromDays(2)) {
     build_time_state = CLOCK_STATE_PAST;
   } else if (now_system > build_time + base::TimeDelta::FromDays(365)) {
     build_time_state = CLOCK_STATE_FUTURE;
   }
 
   UMA_HISTOGRAM_ENUMERATION("interstitial.ssl.clockstate.network2",
                             network_time_result, NETWORK_CLOCK_STATE_MAX);
   UMA_HISTOGRAM_ENUMERATION("interstitial.ssl.clockstate.build_time",
                             build_time_state, CLOCK_STATE_MAX);
 
   switch (network_state) {
-    case NETWORK_CLOCK_STATE_UNKNOWN_NO_SYNC:
     case NETWORK_CLOCK_STATE_UNKNOWN_SYNC_LOST:
+    case NETWORK_CLOCK_STATE_UNKNOWN_NO_SYNC_ATTEMPT:
+    case NETWORK_CLOCK_STATE_UNKNOWN_NO_SUCCESSFUL_SYNC:
+    case NETWORK_CLOCK_STATE_UNKNOWN_FIRST_SYNC_PENDING:
+    case NETWORK_CLOCK_STATE_UNKNOWN_SUBSEQUENT_SYNC_PENDING:
       return build_time_state;
     case NETWORK_CLOCK_STATE_OK:
       return CLOCK_STATE_OK;
     case NETWORK_CLOCK_STATE_CLOCK_IN_PAST:
       return CLOCK_STATE_PAST;
     case NETWORK_CLOCK_STATE_CLOCK_IN_FUTURE:
       return CLOCK_STATE_FUTURE;
     case NETWORK_CLOCK_STATE_MAX:
       NOTREACHED();
       return CLOCK_STATE_UNKNOWN;
@@ skipping 208 matching lines @@
   return std::find(dns_names_domain.begin(), dns_names_domain.end() - 1,
                    host_name_domain) != dns_names_domain.end() - 1;
 }
 
 bool IsHostnameNonUniqueOrDotless(const std::string& hostname) {
   return net::IsHostnameNonUnique(hostname) ||
          hostname.find('.') == std::string::npos;
 }
 
 }  // namespace ssl_errors