From 315aa450916041c90aa18fe8fd20ae5b8e38df08 Mon Sep 17 00:00:00 2001 From: James Teow Date: Thu, 28 Dec 2023 23:02:18 +0000 Subject: [PATCH] Bug 1872290 - Enable browser.search.log in all browser search telemetry tests - r=scunnane Differential Revision: https://phabricator.services.mozilla.com/D197388 --- .../components/search/test/browser/telemetry/browser.toml | 1 + ...nt_telemetry_categorization_enabled_by_nimbus_variable.js | 4 ---- ..._glean_serp_event_telemetry_enabled_by_nimbus_variable.js | 4 ---- .../telemetry/browser_search_telemetry_abandonment.js | 5 +---- .../browser_search_telemetry_adImpression_component.js | 5 +---- .../browser_search_telemetry_categorization_timing.js | 5 +---- ...owser_search_telemetry_domain_categorization_ad_values.js | 4 ---- ..._search_telemetry_domain_categorization_download_timer.js | 4 ---- ...wser_search_telemetry_domain_categorization_extraction.js | 1 - ...arch_telemetry_domain_categorization_locale_and_region.js | 4 ---- ...owser_search_telemetry_domain_categorization_reporting.js | 4 ---- .../telemetry/browser_search_telemetry_engagement_cached.js | 5 +---- .../browser_search_telemetry_engagement_cached_serp.js | 5 +---- .../telemetry/browser_search_telemetry_engagement_content.js | 5 +---- .../browser_search_telemetry_engagement_multiple_tabs.js | 1 - .../telemetry/browser_search_telemetry_engagement_non_ad.js | 5 +---- .../browser_search_telemetry_engagement_query_params.js | 5 +---- .../browser_search_telemetry_engagement_redirect.js | 5 +---- .../telemetry/browser_search_telemetry_engagement_target.js | 5 +---- .../browser/telemetry/browser_search_telemetry_new_window.js | 5 +---- .../browser/telemetry/browser_search_telemetry_private.js | 5 +---- .../browser_search_telemetry_remote_settings_sync.js | 1 - .../browser/telemetry/browser_search_telemetry_shopping.js | 5 +---- .../browser/telemetry/browser_search_telemetry_sources.js | 2 -- .../telemetry/browser_search_telemetry_sources_about.js | 2 -- .../telemetry/browser_search_telemetry_sources_ads.js | 5 +---- .../telemetry/browser_search_telemetry_sources_ads_clicks.js | 5 +---- .../browser_search_telemetry_sources_ads_data_attributes.js | 5 +---- .../browser_search_telemetry_sources_ads_load_events.js | 5 +---- .../telemetry/browser_search_telemetry_sources_in_content.js | 2 -- .../telemetry/browser_search_telemetry_sources_navigation.js | 2 -- .../browser_search_telemetry_sources_webextension.js | 2 -- 32 files changed, 18 insertions(+), 105 deletions(-) diff --git a/browser/components/search/test/browser/telemetry/browser.toml b/browser/components/search/test/browser/telemetry/browser.toml index 5284231e83e4..9f93a143b4de 100644 --- a/browser/components/search/test/browser/telemetry/browser.toml +++ b/browser/components/search/test/browser/telemetry/browser.toml @@ -1,6 +1,7 @@ [DEFAULT] tags = "search-telemetry" support-files = ["head.js"] +prefs = ["browser.search.log=true"] ["browser_search_glean_serp_event_telemetry_categorization_enabled_by_nimbus_variable.js"] support-files = [ diff --git a/browser/components/search/test/browser/telemetry/browser_search_glean_serp_event_telemetry_categorization_enabled_by_nimbus_variable.js b/browser/components/search/test/browser/telemetry/browser_search_glean_serp_event_telemetry_categorization_enabled_by_nimbus_variable.js index da748111fcf9..3dd88d770cfb 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_glean_serp_event_telemetry_categorization_enabled_by_nimbus_variable.js +++ b/browser/components/search/test/browser/telemetry/browser_search_glean_serp_event_telemetry_categorization_enabled_by_nimbus_variable.js @@ -83,10 +83,6 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; - await SpecialPowers.pushPrefEnv({ - set: [["browser.search.log", true]], - }); - // Clear existing Remote Settings data. await db.clear(); info("Create record with attachment."); diff --git a/browser/components/search/test/browser/telemetry/browser_search_glean_serp_event_telemetry_enabled_by_nimbus_variable.js b/browser/components/search/test/browser/telemetry/browser_search_glean_serp_event_telemetry_enabled_by_nimbus_variable.js index f0271e479e7f..096178499b92 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_glean_serp_event_telemetry_enabled_by_nimbus_variable.js +++ b/browser/components/search/test/browser/telemetry/browser_search_glean_serp_event_telemetry_enabled_by_nimbus_variable.js @@ -106,10 +106,6 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; - await SpecialPowers.pushPrefEnv({ - set: [["browser.search.log", true]], - }); - registerCleanupFunction(async () => { SearchSERPTelemetry.overrideSearchTelemetryForTests(); Services.telemetry.canRecordExtended = oldCanRecord; diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_abandonment.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_abandonment.js index a2caa6c373e7..0c1d8b823482 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_abandonment.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_abandonment.js @@ -33,10 +33,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_adImpression_component.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_adImpression_component.js index 704e6c1c1062..8049406d40b4 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_adImpression_component.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_adImpression_component.js @@ -95,10 +95,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); // The tests evaluate whether or not ads are visible depending on whether diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_categorization_timing.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_categorization_timing.js index 879266542fbc..9ecc4e8d9211 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_categorization_timing.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_categorization_timing.js @@ -31,10 +31,7 @@ add_setup(async function () { SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO); await waitForIdle(); await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_ad_values.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_ad_values.js index d5208fb85c35..1cc1ea09d991 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_ad_values.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_ad_values.js @@ -69,10 +69,6 @@ add_setup(async function () { SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO); await waitForIdle(); - await SpecialPowers.pushPrefEnv({ - set: [["browser.search.log", true]], - }); - await db.clear(); let { record, attachment } = await mockRecordWithAttachment({ id: "example_id", diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_download_timer.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_download_timer.js index b054e091efcd..b25155908b5f 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_download_timer.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_download_timer.js @@ -83,10 +83,6 @@ add_setup(async function () { SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO); await waitForIdle(); - await SpecialPowers.pushPrefEnv({ - set: [["browser.search.log", true]], - }); - let defaultDownloadSettings = { ...TELEMETRY_CATEGORIZATION_DOWNLOAD_SETTINGS, }; diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_extraction.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_extraction.js index d18e62123f5d..da93c2b916c8 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_extraction.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_extraction.js @@ -169,7 +169,6 @@ const TESTS = [ add_setup(async function () { await SpecialPowers.pushPrefEnv({ set: [ - ["browser.search.log", true], ["browser.search.serpEventTelemetry.enabled", true], ["browser.search.serpEventTelemetryCategorization.enabled", true], ], diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_locale_and_region.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_locale_and_region.js index 04f1d16c79b7..21d7e83e5168 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_locale_and_region.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_locale_and_region.js @@ -75,10 +75,6 @@ add_setup(async function () { SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO); await waitForIdle(); - await SpecialPowers.pushPrefEnv({ - set: [["browser.search.log", true]], - }); - await db.clear(); let { record, attachment } = await mockRecordWithAttachment({ id: "example_id", diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_reporting.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_reporting.js index 22dc896606ad..04c3fc0bcfbd 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_reporting.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_domain_categorization_reporting.js @@ -69,10 +69,6 @@ add_setup(async function () { SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO); await waitForIdle(); - await SpecialPowers.pushPrefEnv({ - set: [["browser.search.log", true]], - }); - registerCleanupFunction(async () => { SearchSERPTelemetry.overrideSearchTelemetryForTests(); resetTelemetry(); diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_cached.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_cached.js index ba7499297ab4..791e29a01f5d 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_cached.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_cached.js @@ -90,10 +90,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_cached_serp.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_cached_serp.js index 6ad43856b3bf..72e26639fb27 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_cached_serp.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_cached_serp.js @@ -49,10 +49,7 @@ add_setup(async function () { SearchSERPTelemetry.overrideSearchTelemetryForTests(TEST_PROVIDER_INFO); await waitForIdle(); await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_content.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_content.js index 89f08a59947e..a7ea62ebd5cc 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_content.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_content.js @@ -76,10 +76,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_multiple_tabs.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_multiple_tabs.js index 18e41b45724b..fbe6f4fc7373 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_multiple_tabs.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_multiple_tabs.js @@ -64,7 +64,6 @@ add_setup(async function () { await waitForIdle(); await SpecialPowers.pushPrefEnv({ set: [ - ["browser.search.log", true], ["browser.search.serpEventTelemetry.enabled", true], ["dom.ipc.processCount.webIsolated", MAX_IPC], ], diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_non_ad.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_non_ad.js index ea229f54a8eb..d351234d5034 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_non_ad.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_non_ad.js @@ -33,10 +33,7 @@ add_setup(async function () { await waitForIdle(); // Enable local telemetry recording for the duration of the tests. await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_query_params.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_query_params.js index 4527de6f20fc..6d93707d685b 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_query_params.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_query_params.js @@ -51,10 +51,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_redirect.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_redirect.js index fa63bdfa97c2..5d7f2ee408e8 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_redirect.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_redirect.js @@ -38,10 +38,7 @@ add_setup(async function () { await waitForIdle(); // Enable local telemetry recording for the duration of the tests. await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_target.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_target.js index 11078db02d51..b30a7bc0c1c3 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_target.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_engagement_target.js @@ -110,10 +110,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_new_window.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_new_window.js index f77372437743..4f943fe92d4a 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_new_window.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_new_window.js @@ -32,10 +32,7 @@ add_setup(async function () { await waitForIdle(); // Enable local telemetry recording for the duration of the tests. await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_private.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_private.js index 789d9ded7c3d..ea7556c8f6d6 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_private.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_private.js @@ -33,10 +33,7 @@ add_setup(async function () { await waitForIdle(); // Enable local telemetry recording for the duration of the tests. await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_remote_settings_sync.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_remote_settings_sync.js index ad47a17b766e..5f2afcf6fc04 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_remote_settings_sync.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_remote_settings_sync.js @@ -86,7 +86,6 @@ add_setup(async function () { // Enable local telemetry recording for the duration of the tests. await SpecialPowers.pushPrefEnv({ set: [ - ["browser.search.log", true], ["browser.search.serpEventTelemetry.enabled", true], // Set the IPC count to a small number so that we only have to open // one additional tab to reuse the same process. diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_shopping.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_shopping.js index 8b688b9480d0..e2352b53f455 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_shopping.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_shopping.js @@ -56,10 +56,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources.js index dbed1adf4817..7fa66a1adf94 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources.js @@ -69,7 +69,6 @@ add_setup(async function () { // Enable local telemetry recording for the duration of the tests. let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; - Services.prefs.setBoolPref("browser.search.log", true); await SearchTestUtils.installSearchExtension( { @@ -86,7 +85,6 @@ add_setup(async function () { registerCleanupFunction(async () => { gCUITestUtils.removeSearchBar(); - Services.prefs.clearUserPref("browser.search.log"); SearchSERPTelemetry.overrideSearchTelemetryForTests(); Services.telemetry.canRecordExtended = oldCanRecord; resetTelemetry(); diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_about.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_about.js index 174ef2b6eda7..a313c75ac7eb 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_about.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_about.js @@ -67,7 +67,6 @@ add_setup(async function () { // Enable local telemetry recording for the duration of the tests. let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; - Services.prefs.setBoolPref("browser.search.log", true); await SearchTestUtils.installSearchExtension( { @@ -84,7 +83,6 @@ add_setup(async function () { registerCleanupFunction(async () => { gCUITestUtils.removeSearchBar(); - Services.prefs.clearUserPref("browser.search.log"); SearchSERPTelemetry.overrideSearchTelemetryForTests(); Services.telemetry.canRecordExtended = oldCanRecord; resetTelemetry(); diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads.js index 8dd230dc5368..0fd93da30ff3 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads.js @@ -39,10 +39,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_clicks.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_clicks.js index 8dae7e1ae6a9..11d2176563a4 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_clicks.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_clicks.js @@ -35,10 +35,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_data_attributes.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_data_attributes.js index b37930994d13..3c5e0a464e08 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_data_attributes.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_data_attributes.js @@ -35,10 +35,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_load_events.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_load_events.js index 26f25d149d99..069e13d339e6 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_load_events.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_ads_load_events.js @@ -35,10 +35,7 @@ add_setup(async function () { let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; await SpecialPowers.pushPrefEnv({ - set: [ - ["browser.search.log", true], - ["browser.search.serpEventTelemetry.enabled", true], - ], + set: [["browser.search.serpEventTelemetry.enabled", true]], }); registerCleanupFunction(async () => { diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_in_content.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_in_content.js index 3a6472d66920..9bff6678573f 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_in_content.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_in_content.js @@ -49,10 +49,8 @@ add_setup(async function () { // Enable local telemetry recording for the duration of the tests. let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; - Services.prefs.setBoolPref("browser.search.log", true); registerCleanupFunction(async () => { - Services.prefs.clearUserPref("browser.search.log"); SearchSERPTelemetry.overrideSearchTelemetryForTests(); Services.telemetry.canRecordExtended = oldCanRecord; resetTelemetry(); diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_navigation.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_navigation.js index c28c51455026..7ce681701a0e 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_navigation.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_navigation.js @@ -64,7 +64,6 @@ add_setup(async function () { // Enable local telemetry recording for the duration of the tests. let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; - Services.prefs.setBoolPref("browser.search.log", true); await SearchTestUtils.installSearchExtension( { @@ -81,7 +80,6 @@ add_setup(async function () { registerCleanupFunction(async () => { BrowserTestUtils.removeTab(tab); - Services.prefs.clearUserPref("browser.search.log"); SearchSERPTelemetry.overrideSearchTelemetryForTests(); Services.telemetry.canRecordExtended = oldCanRecord; resetTelemetry(); diff --git a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_webextension.js b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_webextension.js index a472d70b2dbc..f7b22f004b9a 100644 --- a/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_webextension.js +++ b/browser/components/search/test/browser/telemetry/browser_search_telemetry_sources_webextension.js @@ -48,7 +48,6 @@ add_setup(async function () { // Enable local telemetry recording for the duration of the tests. let oldCanRecord = Services.telemetry.canRecordExtended; Services.telemetry.canRecordExtended = true; - Services.prefs.setBoolPref("browser.search.log", true); await SearchTestUtils.installSearchExtension( { @@ -65,7 +64,6 @@ add_setup(async function () { registerCleanupFunction(async () => { gCUITestUtils.removeSearchBar(); - Services.prefs.clearUserPref("browser.search.log"); SearchSERPTelemetry.overrideSearchTelemetryForTests(); Services.telemetry.canRecordExtended = oldCanRecord; resetTelemetry();