Use stricter type checking in UMA_HISTOGRAM_ENUMERATION

chrome/browser/policy/cloud/cloud_policy_invalidator.cc

 // Copyright 2013 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 "chrome/browser/policy/cloud/cloud_policy_invalidator.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/hash.h"
@@ skipping 392 matching lines @@
   // The invalidation version is the timestamp in microseconds. If the
   // invalidation occurred before the last policy fetch, then the invalidation
   // is expired. Time is added to the invalidation to err on the side of not
   // expired.
   base::Time invalidation_time = base::Time::UnixEpoch() +
       base::TimeDelta::FromMicroseconds(version) +
       base::TimeDelta::FromSeconds(kMaxInvalidationTimeDelta);
   return invalidation_time < last_fetch_time;
 }
 
-int CloudPolicyInvalidator::GetPolicyRefreshMetric(bool policy_changed) {
+MetricPolicyRefresh CloudPolicyInvalidator::GetPolicyRefreshMetric(
+    bool policy_changed) {
   if (policy_changed) {
     if (invalid_)
       return METRIC_POLICY_REFRESH_INVALIDATED_CHANGED;
     if (GetInvalidationsEnabled())
       return METRIC_POLICY_REFRESH_CHANGED;
     return METRIC_POLICY_REFRESH_CHANGED_NO_INVALIDATIONS;
   }
   if (invalid_)
     return METRIC_POLICY_REFRESH_INVALIDATED_UNCHANGED;
   return METRIC_POLICY_REFRESH_UNCHANGED;
 }
 
-int CloudPolicyInvalidator::GetInvalidationMetric(bool is_missing_payload,
-                                                  bool is_expired) {
+PolicyInvalidationType CloudPolicyInvalidator::GetInvalidationMetric(
+    bool is_missing_payload,
+    bool is_expired) {
   if (is_expired) {
     if (is_missing_payload)
       return POLICY_INVALIDATION_TYPE_NO_PAYLOAD_EXPIRED;
     return POLICY_INVALIDATION_TYPE_EXPIRED;
   }
   if (is_missing_payload)
     return POLICY_INVALIDATION_TYPE_NO_PAYLOAD;
   return POLICY_INVALIDATION_TYPE_NORMAL;
 }
 
 bool CloudPolicyInvalidator::GetInvalidationsEnabled() {
   if (!invalidations_enabled_)
     return false;
   // If invalidations have been enabled for less than the grace period, then
   // consider invalidations to be disabled for metrics reporting.
   base::TimeDelta elapsed = clock_->Now() - invalidations_enabled_time_;
   return elapsed.InSeconds() >= kInvalidationGracePeriod;
 }
 
 }  // namespace policy