Use histogram function instead of macro for OptimizationFilterStatus

Without this, it chokes if multiple optimization types have filters

Bug: 969558
Change-Id: Ib8e9fa546847a865f91b758e6f4980b1e4eedad3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1743103Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Commit-Queue: Sophie Chang <sophiechang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#685341}

components/optimization_guide/hints_component_util.cc

@@ -9,6 +9,7 @@
 
 #include "base/files/file.h"
 #include "base/files/file_util.h"
+#include "base/metrics/histogram_functions.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/stringprintf.h"
 #include "components/optimization_guide/bloom_filter.h"
@@ -81,10 +82,12 @@ std::unique_ptr<proto::Configuration> ProcessHintsComponent(
 
 void RecordOptimizationFilterStatus(proto::OptimizationType optimization_type,
                                     OptimizationFilterStatus status) {
-  std::string histogram_name = base::StringPrintf(
-      "OptimizationGuide.OptimizationFilterStatus.%s",
-      GetStringNameForOptimizationType(optimization_type).c_str());
-  UMA_HISTOGRAM_ENUMERATION(histogram_name, status);
+  base::UmaHistogramExactLinear(
+      base::StringPrintf(
+          "OptimizationGuide.OptimizationFilterStatus.%s",
+          GetStringNameForOptimizationType(optimization_type).c_str()),
+      static_cast<int>(status),
+      static_cast<int>(OptimizationFilterStatus::kMaxValue));
 }
 
 std::unique_ptr<OptimizationFilter> ProcessOptimizationFilter(

components/optimization_guide/hints_component_util_unittest.cc

@@ -139,6 +139,14 @@ TEST_F(HintsComponentUtilTest, RecordOptimizationFilterStatus) {
   histogram_tester.ExpectUniqueSample(
       "OptimizationGuide.OptimizationFilterStatus.NoScript",
       OptimizationFilterStatus::kFoundServerBlacklistConfig, 1);
+
+  // Record again with a different suffix to make sure it doesn't choke.
+  RecordOptimizationFilterStatus(
+      proto::OptimizationType::DEFER_ALL_SCRIPT,
+      OptimizationFilterStatus::kFoundServerBlacklistConfig);
+  histogram_tester.ExpectUniqueSample(
+      "OptimizationGuide.OptimizationFilterStatus.DeferAllScript",
+      OptimizationFilterStatus::kFoundServerBlacklistConfig, 1);
 }
 
 TEST_F(HintsComponentUtilTest, ProcessOptimizationFilter) {