Bug 1829671 - Move search telemetry tests into a separate sub-directo…

…ry. r=jteow,search-reviewers

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

browser/components/search/moz.build

@@ -14,6 +14,7 @@ EXTRA_JS_MODULES += [
 BROWSER_CHROME_MANIFESTS += [
     "test/browser/browser.ini",
     "test/browser/google_codes/browser.ini",
+    "test/browser/telemetry/browser.ini",
 ]
 
 MARIONETTE_LAYOUT_MANIFESTS += ["test/marionette/manifest.ini"]

browser/components/search/test/browser/browser.ini

@@ -45,121 +45,7 @@ support-files =
 [browser_searchEngine_behaviors.js]
 [browser_search_annotation.js]
 [browser_search_discovery.js]
-[browser_search_glean_serp_telemetry_enabled_by_nimbus_variable.js]
-tags = search-telemetry
-support-files =
-  searchTelemetryAd.html
 [browser_search_nimbus_reload.js]
-[browser_search_telemetry_abandonment.js]
-tags = search-telemetry
-support-files =
-  searchTelemetry.html
-  searchTelemetryAd.html
-  searchTelemetryAd_components_text.html
-[browser_search_telemetry_aboutHome.js]
-tags = search-telemetry
-[browser_search_telemetry_adImpression_component.js]
-tags = search-telemetry
-support-files =
-  searchTelemetryAd_components_carousel.html
-  searchTelemetryAd_components_carousel_below_the_fold.html
-  searchTelemetryAd_components_carousel_doubled.html
-  searchTelemetryAd_components_carousel_first_element_non_visible.html
-  searchTelemetryAd_components_carousel_hidden.html
-  searchTelemetryAd_components_carousel_outer_container.html
-  searchTelemetryAd_components_text.html
-  searchTelemetryAd_components_visibility.html
-  serp.css
-[browser_search_telemetry_categorization_timing.js]
-[browser_search_telemetry_content.js]
-tags = search-telemetry
-[browser_search_telemetry_engagement_cached.js]
-tags = search-telemetry
-support-files =
-  cacheable.html
-  cacheable.html^headers^
-  searchTelemetryAd_components_text.html
-  serp.css
-[browser_search_telemetry_engagement_cached_serp.js]
-tags = search-telemetry
-support-files =
-  searchTelemetryAd_searchbox.html
-  searchTelemetryAd_searchbox.html^headers^
-[browser_search_telemetry_engagement_content.js]
-tags = search-telemetry
-support-files =
-  searchTelemetryAd_searchbox_with_content.html
-  searchTelemetryAd_searchbox_with_content.html^headers^
-  searchTelemetryAd_searchbox_with_content_redirect.html
-  searchTelemetryAd_searchbox_with_content_redirect.html^headers^
-  serp.css
-[browser_search_telemetry_engagement_multiple_tabs.js]
-tags = search-telemetry
-support-files =
-  searchTelemetryAd_searchbox_with_content.html
-  searchTelemetryAd_searchbox_with_content.html^headers^
-[browser_search_telemetry_engagement_non_ad.js]
-tags = search-telemetry
-support-files =
-  searchTelemetryAd_searchbox_with_content.html
-  searchTelemetryAd_searchbox_with_content.html^headers^
-  serp.css
-[browser_search_telemetry_engagement_redirect.js]
-tags = search-telemetry
-support-files =
-  redirect_ad.sjs
-  redirect_final.sjs
-  redirect_once.sjs
-  redirect_thrice.sjs
-  redirect_twice.sjs
-  searchTelemetryAd_components_text.html
-  searchTelemetryAd_nonAdsLink_redirect.html
-  searchTelemetryAd_nonAdsLink_redirect.html^headers^
-  searchTelemetryAd_nonAdsLink_redirect_nonTopLoaded.html
-  searchTelemetryAd_nonAdsLink_redirect_nonTopLoaded.html^headers^
-  serp.css
-[browser_search_telemetry_engagement_target.js]
-tags = search-telemetry
-support-files =
-  searchTelemetryAd_components_text.html
-  searchTelemetryAd_searchbox.html
-  searchTelemetryAd_searchbox.html^headers^
-  serp.css
-[browser_search_telemetry_searchbar.js]
-https_first_disabled = true
-tags = search-telemetry
-support-files =
-  slow_loading_page_with_ads_on_load_event.html
-  slow_loading_page_with_ads.html
-  slow_loading_page_with_ads.sjs
-  telemetrySearchSuggestions.sjs
-  telemetrySearchSuggestions.xml
-[browser_search_telemetry_shopping.js]
-tags = search-telemetry
-support-files =
-  searchTelemetryAd_shopping.html
-[browser_search_telemetry_sources.js]
-tags = search-telemetry
-support-files =
-  searchTelemetry.html
-  searchTelemetryAd.html
-[browser_search_telemetry_sources_ads.js]
-tags = search-telemetry
-support-files =
-  searchTelemetry.html
-  searchTelemetryAd.html
-  searchTelemetryAd_dataAttributes.html
-  searchTelemetryAd_dataAttributes_href.html
-  searchTelemetryAd_dataAttributes_none.html
-[browser_search_telemetry_sources_in_content.js]
-tags = search-telemetry
-support-files =
-  searchTelemetryAd_searchbox_with_content.html
-[browser_search_telemetry_sources_navigation.js]
-tags = search-telemetry
-support-files =
-  searchTelemetry.html
-  searchTelemetryAd.html
 [browser_searchbar_addEngine.js]
 [browser_searchbar_context.js]
 [browser_searchbar_default.js]

browser/components/search/test/browser/browser_trending_suggestions.js

@@ -36,6 +36,7 @@ add_setup(async () => {
 
   SearchTestUtils.useMockIdleService();
   await SearchTestUtils.updateRemoteSettingsConfig(CONFIG_DEFAULT);
+  Services.telemetry.clearScalars();
 
   registerCleanupFunction(async () => {
     let settingsWritten = SearchTestUtils.promiseSearchNotification(