Use stricter type checking in UMA_HISTOGRAM_ENUMERATION

chrome/browser/policy/cloud/cloud_policy_invalidator.h

 // 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.
 
 #ifndef CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_INVALIDATOR_H_
 #define CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_INVALIDATOR_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "components/invalidation/public/invalidation.h"
 #include "components/invalidation/public/invalidation_handler.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
+#include "components/policy/core/common/cloud/enterprise_metrics.h"
 #include "components/policy/proto/device_management_backend.pb.h"
 #include "google/cacheinvalidation/include/types.h"
 
 namespace base {
 class Clock;
 class SequencedTaskRunner;
 }
 
 namespace invalidation {
 class InvalidationService;
@@ skipping 115 matching lines @@
   // Determines if the given policy is different from the policy passed in the
   // previous call.
   bool IsPolicyChanged(const enterprise_management::PolicyData* policy);
 
   // Determine if an invalidation has expired.
   // |version| is the version of the invalidation, or zero for unknown.
   bool IsInvalidationExpired(int64_t version);
 
   // Get the kMetricPolicyRefresh histogram metric which should be incremented
   // when a policy is stored.
-  int GetPolicyRefreshMetric(bool policy_changed);
+  MetricPolicyRefresh GetPolicyRefreshMetric(bool policy_changed);
 
   // Get the kMetricPolicyInvalidations histogram metric which should be
   // incremented when an invalidation is received.
-  int GetInvalidationMetric(bool is_missing_payload, bool is_expired);
+  PolicyInvalidationType GetInvalidationMetric(bool is_missing_payload,
+                                               bool is_expired);
 
   // Determine if invalidations have been enabled longer than the grace period.
   bool GetInvalidationsEnabled();
 
   // The state of the object.
   enum State {
     UNINITIALIZED,
     STOPPED,
     STARTED,
     SHUT_DOWN
@@ skipping 67 matching lines @@
 
   // WeakPtrFactory used to create callbacks to this object.
   base::WeakPtrFactory<CloudPolicyInvalidator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyInvalidator);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_CLOUD_POLICY_INVALIDATOR_H_