For #24205: Remove wrapper from set default browser toolbar menu.

This metric is recorded in the context of the default browser experiment.

app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt

@@ -76,9 +76,6 @@ sealed class Event {
     object SearchSuggestionClicked : Event()
     object OpenedTabSuggestionClicked : Event()
 
-    // Set default browser experiment metrics
-    object SetDefaultBrowserToolbarMenuClicked : Event()
-
     // Home menu interaction
     object HomeMenuSettingsItemClicked : Event()
     object HomeScreenDisplayed : Event()

app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt

@@ -16,7 +16,6 @@ import org.mozilla.fenix.GleanMetrics.ContextMenu
 import org.mozilla.fenix.GleanMetrics.ContextualMenu
 import org.mozilla.fenix.GleanMetrics.CreditCards
 import org.mozilla.fenix.GleanMetrics.Events
-import org.mozilla.fenix.GleanMetrics.ExperimentsDefaultBrowser
 import org.mozilla.fenix.GleanMetrics.HomeMenu
 import org.mozilla.fenix.GleanMetrics.HomeScreen
 import org.mozilla.fenix.GleanMetrics.Metrics
@@ -105,9 +104,6 @@ private val Event.wrapper: EventWrapper<*>?
             { ContextMenu.itemTappedKeys.valueOf(it) }
         )
 
-        is Event.SetDefaultBrowserToolbarMenuClicked -> EventWrapper<NoExtraKeys>(
-            { ExperimentsDefaultBrowser.toolbarMenuClicked.record(it) }
-        )
         is Event.PocketTopSiteClicked -> EventWrapper<NoExtraKeys>(
             { Pocket.pocketTopSiteClicked.record(it) }
         )

app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt

@@ -30,6 +30,7 @@ import mozilla.components.service.glean.private.NoExtras
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
 import org.mozilla.fenix.GleanMetrics.Collections
 import org.mozilla.fenix.GleanMetrics.Events
+import org.mozilla.fenix.GleanMetrics.ExperimentsDefaultBrowser
 import org.mozilla.fenix.GleanMetrics.ReaderMode
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.NavGraphDirections
@@ -41,7 +42,6 @@ import org.mozilla.fenix.collections.SaveCollectionStep
 import org.mozilla.fenix.components.FenixSnackbar
 import org.mozilla.fenix.components.TabCollectionStorage
 import org.mozilla.fenix.components.accounts.AccountState
-import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.getRootView
@@ -361,7 +361,7 @@ class DefaultBrowserToolbarMenuController(
                 )
             }
             is ToolbarMenu.Item.SetDefaultBrowser -> {
-                metrics.track(Event.SetDefaultBrowserToolbarMenuClicked)
+                ExperimentsDefaultBrowser.toolbarMenuClicked.record(NoExtras())
                 activity.openSetDefaultBrowserOption()
             }
             is ToolbarMenu.Item.RemoveFromTopSites -> {

app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt

@@ -60,6 +60,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mozilla.fenix.GleanMetrics.Collections
 import org.mozilla.fenix.GleanMetrics.Events
+import org.mozilla.fenix.GleanMetrics.ExperimentsDefaultBrowser
 import org.mozilla.fenix.GleanMetrics.ReaderMode
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.NavGraphDirections
@@ -783,6 +784,24 @@ class DefaultBrowserToolbarMenuControllerTest {
         verify { navController.navigate(turnOnSyncDirections, null) }
     }
 
+    @Test
+    fun `GIVEN the default browser experiment WHEN SetDefaultBrowser menu item is pressed THEN proper metrics are recorded`() = runBlockingTest {
+        val item = ToolbarMenu.Item.SetDefaultBrowser
+
+        val store: BrowserStore = mockk()
+
+        val controller = createController(
+            scope = this, store = store,
+            bookmarkTapped = { _, _ -> }
+        )
+
+        assertFalse(ExperimentsDefaultBrowser.toolbarMenuClicked.testHasValue())
+
+        controller.handleToolbarItemInteraction(item)
+
+        assertTrue(ExperimentsDefaultBrowser.toolbarMenuClicked.testHasValue())
+    }
+
     @Suppress("LongParameterList")
     private fun createController(
         scope: CoroutineScope,

detekt-baseline.xml

@@ -368,7 +368,6 @@
     <ID>UndocumentedPublicClass:Event.kt$Event$SearchWidgetVoiceSearchPressed : Event</ID>
     <ID>UndocumentedPublicClass:Event.kt$Event$SearchWithAds : Event</ID>
     <ID>UndocumentedPublicClass:Event.kt$Event$SendTab : Event</ID>
-    <ID>UndocumentedPublicClass:Event.kt$Event$SetDefaultBrowserToolbarMenuClicked : Event</ID>
     <ID>UndocumentedPublicClass:Event.kt$Event$ShareBookmark : Event</ID>
     <ID>UndocumentedPublicClass:Event.kt$Event$ShowAllBookmarks : Event</ID>
     <ID>UndocumentedPublicClass:Event.kt$Event$ShowAllRecentTabs : Event</ID>