From 2fd8359d30749be7f7d98794f10daca21604892e Mon Sep 17 00:00:00 2001
From: James Hugman <james@hugman.tv>
Date: Wed, 31 Jan 2024 12:05:20 +0000
Subject: [PATCH] =?UTF-8?q?Bug=201880476=20=E2=80=94=20Rename=20gleanplumb?=
 =?UTF-8?q?=20to=20nimbus=20messaging?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt | 4 ++--
 app/src/main/java/org/mozilla/fenix/components/Analytics.kt   | 2 +-
 .../org/mozilla/fenix/messaging/DefaultMessageController.kt   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt b/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt
index 1a9024ee67..588078298e 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt
@@ -11,7 +11,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
-import org.mozilla.experiments.nimbus.GleanPlumbMessageHelper
+import org.mozilla.experiments.nimbus.NimbusMessagingHelperInterface
 import org.mozilla.experiments.nimbus.StringHolder
 import org.mozilla.fenix.R
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
@@ -28,7 +28,7 @@ class OnboardingMapperTest {
 
     private lateinit var junoOnboardingFeature: JunoOnboarding
     private lateinit var jexlConditions: Map<String, String>
-    private lateinit var jexlHelper: GleanPlumbMessageHelper
+    private lateinit var jexlHelper: NimbusMessagingHelperInterface
     private lateinit var evalFunction: (String) -> Boolean
 
     @Before
diff --git a/app/src/main/java/org/mozilla/fenix/components/Analytics.kt b/app/src/main/java/org/mozilla/fenix/components/Analytics.kt
index da0fe53ea0..b68ea5e145 100644
--- a/app/src/main/java/org/mozilla/fenix/components/Analytics.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/Analytics.kt
@@ -168,7 +168,7 @@ class Analytics(
         NimbusMessagingStorage(
             context = context,
             metadataStorage = OnDiskMessageMetadataStorage(context),
-            gleanPlumb = experiments,
+            nimbus = experiments,
             messagingFeature = FxNimbusMessaging.features.messaging,
             attributeProvider = CustomAttributeProvider,
         )
diff --git a/app/src/main/java/org/mozilla/fenix/messaging/DefaultMessageController.kt b/app/src/main/java/org/mozilla/fenix/messaging/DefaultMessageController.kt
index 21f47f76a3..a006ab02bf 100644
--- a/app/src/main/java/org/mozilla/fenix/messaging/DefaultMessageController.kt
+++ b/app/src/main/java/org/mozilla/fenix/messaging/DefaultMessageController.kt
@@ -13,7 +13,7 @@ import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.MessageCl
 import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.MessageDismissed
 
 /**
- * Handles default interactions with the ui of GleanPlumb messages.
+ * Handles default interactions with the ui of Nimbus Messaging messages.
  */
 class DefaultMessageController(
     private val appStore: AppStore,