RecordPermissionActionUkm should record stable content setting type ids

Bug: 1046341
Change-Id: Ia45fa0be8876e043bd5e9922da6f61995c7d3fad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2030884
Commit-Queue: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#737805}

chrome/browser/permissions/permission_context_base_unittest.cc

@@ -275,10 +275,17 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
       auto* entry = entries.front();
       ukm_recorder.ExpectEntrySourceHasUrl(entry, url);
 
+      size_t num_values = 0;
+
+      EXPECT_NE(ContentSettingTypeToHistogramValue(content_settings_type,
+                                                   &num_values),
+                -1);
+
       EXPECT_EQ(*ukm_recorder.GetEntryMetric(entry, "Source"),
                 static_cast<int64_t>(PermissionSourceUI::PROMPT));
       EXPECT_EQ(*ukm_recorder.GetEntryMetric(entry, "PermissionType"),
-                static_cast<int64_t>(content_settings_type));
+                static_cast<int64_t>(ContentSettingTypeToHistogramValue(
+                    content_settings_type, &num_values)));
       EXPECT_EQ(*ukm_recorder.GetEntryMetric(entry, "Action"),
                 static_cast<int64_t>(action.value()));
 

chrome/browser/permissions/permission_uma_util.cc

@@ -148,10 +148,12 @@ void RecordPermissionActionUkm(
   if (!source_id.has_value())
     return;
 
+  size_t num_values = 0;
   ukm::builders::Permission(source_id.value())
       .SetAction(static_cast<int64_t>(action))
       .SetGesture(static_cast<int64_t>(gesture_type))
-      .SetPermissionType(static_cast<int64_t>(permission))
+      .SetPermissionType(static_cast<int64_t>(
+          ContentSettingTypeToHistogramValue(permission, &num_values)))
       .SetPriorDismissals(std::min(kPriorCountCap, dismiss_count))
       .SetPriorIgnores(std::min(kPriorCountCap, ignore_count))
       .SetSource(static_cast<int64_t>(source_ui))