commit b09ef74238c48fcfcdc7668e072f702e0c5c89fd
parent dc2af787ceaa6b8049b2b01831f53d3ee62c3596
Author: Serban Stanca <sstanca@mozilla.com>
Date: Fri, 19 Dec 2025 22:19:37 +0200
Revert "Bug 1998930 - Don't show contextual search for default search engine. r=urlbar-reviewers,Standard8" for causing mochitests failures in browser_searchModeSwitcher_keyNavigation.js.
This reverts commit 58e2f2364a33bd91662856f12dd7a23bed063149.
Diffstat:
3 files changed, 12 insertions(+), 71 deletions(-)
diff --git a/browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs b/browser/components/urlbar/ActionsProviderContextualSearch.sys.mjs
@@ -123,11 +123,6 @@ class ProviderContextualSearch extends ActionsProvider {
return engine;
}
- // Don't match the default engine for non-query-matches.
- let defaultEngine = queryContext.isPrivate
- ? Services.search.defaultPrivateEngine
- : Services.search.defaultEngine;
-
let browser =
lazy.BrowserWindowTracker.getTopWindow()?.gBrowser.selectedBrowser;
if (!browser) {
@@ -165,12 +160,12 @@ class ProviderContextualSearch extends ActionsProvider {
// Cache the result against this host so we do not need to rerun
// the same query every keystroke.
this.#hostEngines.set(host, hostEngine);
- if (hostEngine && hostEngine.engine.name != defaultEngine.name) {
+ if (hostEngine) {
return hostEngine;
}
} else if (host) {
let cachedEngine = this.#hostEngines.get(host);
- if (cachedEngine && cachedEngine.engine.name != defaultEngine.name) {
+ if (cachedEngine) {
return cachedEngine;
}
}
@@ -178,8 +173,6 @@ class ProviderContextualSearch extends ActionsProvider {
// Lastly match any openSearch
if (browser) {
let openSearchEngines = lazy.OpenSearchManager.getEngines(browser);
- // We don't need to check if the engine has the same name as the
- // default engine because OpenSearchManager already handles that.
if (openSearchEngines.length) {
return { type: OPEN_SEARCH_ENGINE, engine: openSearchEngines[0] };
}
diff --git a/browser/components/urlbar/tests/browser/browser_contextualsearch.js b/browser/components/urlbar/tests/browser/browser_contextualsearch.js
@@ -265,72 +265,14 @@ add_task(async function test_tab_to_search_engine() {
await SearchTestUtils.updateRemoteSettingsConfig(CONFIG);
});
-add_task(async function test_dont_suggest_default_engine() {
- await UrlbarTestUtils.promiseAutocompleteResultPopup({
- window,
- value: "default",
- });
-
- Assert.ok(
- await hasActions(1),
- "Default engine is suggested when it matches the query"
- );
-
- // Load a URI from the host of the default engine.
- await loadUri("https://example.com/");
-
- await UrlbarTestUtils.promiseAutocompleteResultPopup({
- window,
- value: "something",
- });
-
- Assert.ok(
- !(await hasActions(1)),
- "Default engine is not suggested based on current host"
- );
-
- await UrlbarTestUtils.promisePopupClose(window, () => {
- EventUtils.synthesizeKey("KEY_Escape");
- });
-});
-
-add_task(async function test_dont_suggest_default_engine() {
- await UrlbarTestUtils.promiseAutocompleteResultPopup({
- window,
- value: "default",
- });
-
- Assert.ok(
- await hasActions(1),
- "Default engine is suggested when it matches the query"
- );
-
- // Load a URI from the host of the default engine.
- await loadUri("https://example.com/");
-
- await UrlbarTestUtils.promiseAutocompleteResultPopup({
- window,
- value: "something",
- });
-
- Assert.ok(
- !(await hasActions(1)),
- "Default engine is not suggested based on current host"
- );
-
- await UrlbarTestUtils.promisePopupClose(window, () => {
- EventUtils.synthesizeKey("KEY_Escape");
- });
-});
-
-add_task(async function test_onboarding() {
+add_task(async function test_onboarding_default_engine() {
await SpecialPowers.pushPrefEnv({
set: [["browser.urlbar.quickactions.timesToShowOnboardingLabel", 3]],
});
await UrlbarTestUtils.promiseAutocompleteResultPopup({
window,
- value: "non-default",
+ value: "default",
});
Assert.ok(
diff --git a/browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_bounce.js b/browser/components/urlbar/tests/engagementTelemetry/browser/browser_glean_telemetry_bounce.js
@@ -26,6 +26,8 @@ add_setup(async function () {
],
});
+ let oldDefaultEngine = await Services.search.getDefault();
+
let root = gTestPath;
let engineURL = new URL("../../browser/searchSuggestionEngine.xml", root)
.href;
@@ -39,6 +41,10 @@ add_setup(async function () {
Services.prefs.clearUserPref(
"browser.urlbar.quickactions.timesShownOnboardingLabel"
);
+ await Services.search.setDefault(
+ oldDefaultEngine,
+ Ci.nsISearchService.CHANGE_REASON_UNKNOWN
+ );
});
});
@@ -222,8 +228,8 @@ add_task(async function test_other_engagement() {
{
view_time: "1.2",
selected_result: expected.selected_result,
- results: expected.results,
- n_results: expected.n_results,
+ results: "search_engine,action",
+ n_results: "2",
interaction: expected.interaction,
search_mode: expected.search_mode,
search_engine_default_id: expected.search_engine_default_id,
