From 17349abf8697ff6bc5ee15ffc61e2516a5a36fc5 Mon Sep 17 00:00:00 2001
From: Beth Rennie <beth@brennie.ca>
Date: Wed, 30 Apr 2025 03:22:10 +0000
Subject: [PATCH] Bug 1961629 - Use ExperimentFeature.getEnrollmentMetadata()
 in browser/components/search r=search-reviewers,jteow

Differential Revision: https://phabricator.services.mozilla.com/D246153
---
 .../search/SERPCategorization.sys.mjs         | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/browser/components/search/SERPCategorization.sys.mjs b/browser/components/search/SERPCategorization.sys.mjs
index 0c8312095097..9fd716eedfbf 100644
--- a/browser/components/search/SERPCategorization.sys.mjs
+++ b/browser/components/search/SERPCategorization.sys.mjs
@@ -11,7 +11,7 @@ import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
 const lazy = {};
 
 ChromeUtils.defineESModuleGetters(lazy, {
-  ExperimentAPI: "resource://nimbus/ExperimentAPI.sys.mjs",
+  EnrollmentType: "resource://nimbus/ExperimentAPI.sys.mjs",
   NimbusFeatures: "resource://nimbus/ExperimentAPI.sys.mjs",
   Region: "resource://gre/modules/Region.sys.mjs",
   RemoteSettings: "resource://services-settings/remote-settings.sys.mjs",
@@ -516,26 +516,25 @@ class CategorizationRecorder {
 
     lazy.logConsole.debug("Found targetExperiment:", targetExperiment);
 
-    // Try checking if an Experiment exists, otherwise check for a Rollout.
-    let metadata =
-      lazy.ExperimentAPI.getExperimentMetaData({
-        featureId: "search",
-        slug: targetExperiment,
-      }) ??
-      lazy.ExperimentAPI.getRolloutMetaData({
-        featureId: "search",
-        slug: targetExperiment,
-      });
-    if (!metadata) {
-      lazy.logConsole.debug(
-        "No experiment or rollout found that matches targetExperiment."
+    let metadata = lazy.NimbusFeatures.search.getEnrollmentMetadata(
+      lazy.EnrollmentType.EXPERIMENT
+    );
+    if (metadata?.slug !== targetExperiment) {
+      metadata = lazy.NimbusFeatures.search.getEnrollmentMetadata(
+        lazy.EnrollmentType.ROLLOUT
       );
-      return;
+
+      if (metadata?.slug !== targetExperiment) {
+        lazy.logConsole.debug(
+          "No experiment or rollout found that matches targetExperiment."
+        );
+        return;
+      }
     }
 
     let experimentToRecord = {
       slug: metadata.slug,
-      branch: metadata.branch?.slug,
+      branch: metadata.branch,
     };
     lazy.logConsole.debug("Experiment data:", experimentToRecord);
     Glean.serp.experimentInfo.set(experimentToRecord);