Bug 1887331 - Fix test_search_config_v2_nimbus.js for Thunderbird. r=barret

Thunderbird doesn't have the STUDIES_OPT_OUT_PREF pref.

Differential Revision: https://phabricator.services.mozilla.com/D205514

toolkit/components/moz.build

@@ -130,8 +130,11 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
 if CONFIG["MOZ_WIDGET_TOOLKIT"] not in ("android", "windows"):
     DIRS += ["aboutwebauthn"]
 
+if CONFIG["MOZ_BUILD_APP"] == "browser" or CONFIG["MOZ_BUILD_APP"] == "comm/mail":
+    DIRS += ["normandy"]
+
 if CONFIG["MOZ_BUILD_APP"] == "browser":
-    DIRS += ["normandy", "messaging-system"]
+    DIRS += ["messaging-system"]
 
 DIRS += ["nimbus"]
 

toolkit/components/nimbus/lib/ExperimentManager.sys.mjs

@@ -95,8 +95,8 @@ export class _ExperimentManager {
 
   get studiesEnabled() {
     return (
-      Services.prefs.getBoolPref(UPLOAD_ENABLED_PREF) &&
-      Services.prefs.getBoolPref(STUDIES_OPT_OUT_PREF)
+      Services.prefs.getBoolPref(UPLOAD_ENABLED_PREF, false) &&
+      Services.prefs.getBoolPref(STUDIES_OPT_OUT_PREF, false)
     );
   }