Use stricter type checking in UMA_HISTOGRAM_ENUMERATION

chrome/browser/engagement/important_sites_util.cc

 // Copyright 2016 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/engagement/important_sites_util.h"
 
 #include <algorithm>
 #include <map>
 #include <memory>
 #include <set>
@@ skipping 38 matching lines @@
 static const int kTimesIgnoredForBlacklist = 3;
 
 // These are the maximum # of bookmarks we can use as signals. If the user has
 // <= kMaxBookmarks, then we just use those bookmarks. Otherwise we filter all
 // bookmarks on site engagement > 0, sort, and trim to kMaxBookmarks.
 static const int kMaxBookmarks = 5;
 
 // We need this to be a macro, as the histogram macros cache their pointers
 // after the first call, so when we change the uma name we check fail if we're
 // just a method.
-#define RECORD_UMA_FOR_IMPORTANT_REASON(uma_name, uma_count_name,    \
-                                        reason_bitfield)             \
-  do {                                                               \
-    int count = 0;                                                   \
-    int32_t bitfield = (reason_bitfield);                            \
-    for (int i = 0; i < ImportantReason::REASON_BOUNDARY; i++) {     \
-      if ((bitfield >> i) & 1) {                                     \
-        count++;                                                     \
-        UMA_HISTOGRAM_ENUMERATION((uma_name), i,                     \
-                                  ImportantReason::REASON_BOUNDARY); \
-      }                                                              \
-    }                                                                \
-    UMA_HISTOGRAM_ENUMERATION((uma_count_name), count,               \
-                              ImportantReason::REASON_BOUNDARY);     \
+#define RECORD_UMA_FOR_IMPORTANT_REASON(uma_name, uma_count_name,              \
+                                        reason_bitfield)                       \
+  do {                                                                         \
+    int count = 0;                                                             \
+    int32_t bitfield = (reason_bitfield);                                      \
+    for (int i = 0; i < ImportantReason::REASON_BOUNDARY; i++) {               \
+      if ((bitfield >> i) & 1) {                                               \
+        count++;                                                               \
+        UMA_HISTOGRAM_ENUMERATION((uma_name), static_cast<ImportantReason>(i), \
+                                  ImportantReason::REASON_BOUNDARY);           \
+      }                                                                        \
+    }                                                                          \
+    UMA_HISTOGRAM_EXACT_LINEAR(                                                \
+        (uma_count_name), count,                                               \
+        static_cast<int>(ImportantReason::REASON_BOUNDARY));                   \
   } while (0)
 
 // Do not change the values here, as they are used for UMA histograms and
 // testing in important_sites_util_unittest.
 enum CrossedReason {
   CROSSED_DURABLE = 0,
   CROSSED_NOTIFICATIONS = 1,
   CROSSED_ENGAGEMENT = 2,
   CROSSED_NOTIFICATIONS_AND_ENGAGEMENT = 3,
   CROSSED_DURABLE_AND_ENGAGEMENT = 4,
@@ skipping 403 matching lines @@
                                                          const GURL& origin) {
   SiteEngagementScore::SetParamValuesForTesting();
   // First get data from site engagement.
   SiteEngagementService* site_engagement_service =
       SiteEngagementService::Get(profile);
   site_engagement_service->ResetBaseScoreForURL(
       origin, SiteEngagementScore::GetMediumEngagementBoundary());
   DCHECK(site_engagement_service->IsEngagementAtLeast(
       origin, blink::mojom::EngagementLevel::MEDIUM));
 }