From 197417c6fddcf0658f1e66efac95995a34ed8233 Mon Sep 17 00:00:00 2001
From: Beth Rennie <beth@brennie.ca>
Date: Thu, 15 Oct 2026 13:35:18 -0400
Subject: [PATCH] Bug 2053517 - Remove more shared preferences gunk

---
 .../src/backends/kotlin/templates/FeatureManifestTemplate.kt  | 4 ++--
 .../kotlin/templates/ImportedModuleInitializationTemplate.kt  | 3 +--
 .../nimbus-fml/src/backends/kotlin/templates/macros.kt        | 3 ---
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/components/support/nimbus-fml/src/backends/kotlin/templates/FeatureManifestTemplate.kt b/components/support/nimbus-fml/src/backends/kotlin/templates/FeatureManifestTemplate.kt
index 95172b93fb6..197351e6f82 100644
--- a/components/support/nimbus-fml/src/backends/kotlin/templates/FeatureManifestTemplate.kt
+++ b/components/support/nimbus-fml/src/backends/kotlin/templates/FeatureManifestTemplate.kt
@@ -39,8 +39,8 @@ object {{ nimbus_object }} : FeatureManifestInterface<{{ nimbus_object }}.Featur
         {%- let class_name = raw_name|class_name %}
         {{ f.doc()|comment("        ") }}
         val {{raw_name|var_name}}: FeatureHolder<{{class_name}}> by lazy {
-            FeatureHolder({{ nimbus_object }}.getSdk, {{ raw_name|quoted }}) { variables, prefs ->
-                {{ class_name }}(variables, prefs)
+            FeatureHolder({{ nimbus_object }}.getSdk, {{ raw_name|quoted }}) { variables ->
+                {{ class_name }}(variables)
             }
         }
         {%- endfor %}
diff --git a/components/support/nimbus-fml/src/backends/kotlin/templates/ImportedModuleInitializationTemplate.kt b/components/support/nimbus-fml/src/backends/kotlin/templates/ImportedModuleInitializationTemplate.kt
index 9d5e03922c7..f8135872c8b 100644
--- a/components/support/nimbus-fml/src/backends/kotlin/templates/ImportedModuleInitializationTemplate.kt
+++ b/components/support/nimbus-fml/src/backends/kotlin/templates/ImportedModuleInitializationTemplate.kt
@@ -1,6 +1,5 @@
 {%- import "macros.kt" as kt %}
 {%- let variables = "variables" %}
-{%- let prefs = "prefs" %}
 {%- let context = "variables.context" %}
 {%- let class_name = self.inner.about().nimbus_object_name_kt() %}
         {{- class_name }}.features.apply {
@@ -8,7 +7,7 @@
             {{ f.name()|var_name }}.withInitializer { {{ variables }}: Variables ->
                 {{ f.name()|class_name }}(
                     _variables = {{ variables }},
-                    _prefs = {{ prefs }}, {%- for p in f.props() %}
+                    {%- for p in f.props() %}
                     {{p.name()|var_name}} = {{ p.typ()|literal(self, p.default(), context) }}{% if !loop.last %},{% endif %}
                     {%- endfor %}
                 )
diff --git a/components/support/nimbus-fml/src/backends/kotlin/templates/macros.kt b/components/support/nimbus-fml/src/backends/kotlin/templates/macros.kt
index 1ac0e8b1ebc..e05d52fa8bb 100644
--- a/components/support/nimbus-fml/src/backends/kotlin/templates/macros.kt
+++ b/components/support/nimbus-fml/src/backends/kotlin/templates/macros.kt
@@ -33,7 +33,6 @@ private constructor(
    {%- endfor %}
    ) : this(
       _variables = _variables,
-      _prefs = _prefs,
       _defaults = Defaults({% for p in inner.props() %}
       {%- let nm = p.name()|var_name %}{{ nm }} = {{ nm }}{% if !loop.last %}, {% endif %}
       {%- endfor %})
@@ -61,5 +60,3 @@ private constructor(
          )
       )
 {% endmacro %}
-
-{% macro prefs() %}this._prefs{% endmacro %}