commit 9d9ed7f9ee5e1eb3ddb31b563ca06042e576e3e2 parent 978b39e0aa558d820668aece8ed5aac593a94ff6 Author: Daisuke Akatsuka <daisuke@birchill.co.jp> Date: Thu, 11 Dec 2025 01:12:05 +0000 Bug 1995227: Remove payloadHighlights from UrlbarResult r=adw Differential Revision: https://phabricator.services.mozilla.com/D274839 Diffstat:
31 files changed, 8 insertions(+), 114 deletions(-)
diff --git a/browser/components/urlbar/UrlbarProviderAboutPages.sys.mjs b/browser/components/urlbar/UrlbarProviderAboutPages.sys.mjs @@ -52,7 +52,6 @@ export class UrlbarProviderAboutPages extends UrlbarProvider { for (const aboutUrl of lazy.AboutPagesUtils.visibleAboutUrls) { if (aboutUrl.startsWith(searchString)) { let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, payload: { diff --git a/browser/components/urlbar/UrlbarProviderAutofill.sys.mjs b/browser/components/urlbar/UrlbarProviderAutofill.sys.mjs @@ -883,7 +883,6 @@ export class UrlbarProviderAutofill extends UrlbarProvider { } return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.HISTORY, heuristic: true, @@ -937,7 +936,6 @@ export class UrlbarProviderAutofill extends UrlbarProvider { queryContext.searchString + aboutUrl.substring(queryContext.searchString.length); return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.HISTORY, heuristic: true, diff --git a/browser/components/urlbar/UrlbarProviderBookmarkKeywords.sys.mjs b/browser/components/urlbar/UrlbarProviderBookmarkKeywords.sys.mjs @@ -86,7 +86,6 @@ export class UrlbarProviderBookmarkKeywords extends UrlbarProvider { } let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.KEYWORD, source: UrlbarUtils.RESULT_SOURCE.BOOKMARKS, heuristic: true, diff --git a/browser/components/urlbar/UrlbarProviderClipboard.sys.mjs b/browser/components/urlbar/UrlbarProviderClipboard.sys.mjs @@ -116,7 +116,6 @@ export class UrlbarProviderClipboard extends UrlbarProvider { async startQuery(queryContext, addCallback) { // If the query was started, isActive should have cached a url already. let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, payload: { diff --git a/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs b/browser/components/urlbar/UrlbarProviderHeuristicFallback.sys.mjs @@ -159,7 +159,6 @@ export class UrlbarProviderHeuristicFallback extends UrlbarProvider { !lazy.UrlbarPrefs.get("keyword.enabled") ) { return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, heuristic: true, @@ -222,7 +221,6 @@ export class UrlbarProviderHeuristicFallback extends UrlbarProvider { } return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, heuristic: true, @@ -279,7 +277,6 @@ export class UrlbarProviderHeuristicFallback extends UrlbarProvider { } return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.SEARCH, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, heuristic: true, @@ -324,7 +321,6 @@ export class UrlbarProviderHeuristicFallback extends UrlbarProvider { } return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.SEARCH, source: UrlbarUtils.RESULT_SOURCE.SEARCH, heuristic, diff --git a/browser/components/urlbar/UrlbarProviderHistoryUrlHeuristic.sys.mjs b/browser/components/urlbar/UrlbarProviderHistoryUrlHeuristic.sys.mjs @@ -109,7 +109,6 @@ export class UrlbarProviderHistoryUrlHeuristic extends UrlbarProvider { } return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.HISTORY, heuristic: true, diff --git a/browser/components/urlbar/UrlbarProviderInputHistory.sys.mjs b/browser/components/urlbar/UrlbarProviderInputHistory.sys.mjs @@ -137,7 +137,6 @@ export class UrlbarProviderInputHistory extends UrlbarProvider { } let userContextId = row.getResultByName("userContextId") || 0; let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.TAB_SWITCH, source: UrlbarUtils.RESULT_SOURCE.TABS, payload: { @@ -179,7 +178,6 @@ export class UrlbarProviderInputHistory extends UrlbarProvider { let isBlockable = resultSource == UrlbarUtils.RESULT_SOURCE.HISTORY; let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: resultSource, payload: { diff --git a/browser/components/urlbar/UrlbarProviderOmnibox.sys.mjs b/browser/components/urlbar/UrlbarProviderOmnibox.sys.mjs @@ -99,7 +99,6 @@ export class UrlbarProviderOmnibox extends UrlbarProvider { let keyword = queryContext.tokens[0].value; let description = lazy.ExtensionSearchHandler.getDescription(keyword); let heuristicResult = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.OMNIBOX, source: UrlbarUtils.RESULT_SOURCE.ADDON, heuristic: true, @@ -135,7 +134,6 @@ export class UrlbarProviderOmnibox extends UrlbarProvider { continue; } let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.OMNIBOX, source: UrlbarUtils.RESULT_SOURCE.ADDON, payload: { diff --git a/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs b/browser/components/urlbar/UrlbarProviderPlaces.sys.mjs @@ -318,7 +318,6 @@ function makeUrlbarResult(queryContext, info) { case "searchengine": // Return a form history result. return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.SEARCH, source: UrlbarUtils.RESULT_SOURCE.HISTORY, payload: { @@ -338,7 +337,6 @@ function makeUrlbarResult(queryContext, info) { }); case "switchtab": { return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.TAB_SWITCH, source: UrlbarUtils.RESULT_SOURCE.TABS, payload: { @@ -411,7 +409,6 @@ function makeUrlbarResult(queryContext, info) { } return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source, payload: { diff --git a/browser/components/urlbar/UrlbarProviderPrivateSearch.sys.mjs b/browser/components/urlbar/UrlbarProviderPrivateSearch.sys.mjs @@ -103,7 +103,6 @@ export class UrlbarProviderPrivateSearch extends UrlbarProvider { } let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.SEARCH, source: UrlbarUtils.RESULT_SOURCE.SEARCH, suggestedIndex: 1, diff --git a/browser/components/urlbar/UrlbarProviderQuickSuggest.sys.mjs b/browser/components/urlbar/UrlbarProviderQuickSuggest.sys.mjs @@ -479,7 +479,6 @@ export class UrlbarProviderQuickSuggest extends UrlbarProvider { } return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.SEARCH, isBestMatch: !!suggestion.is_top_pick, diff --git a/browser/components/urlbar/UrlbarProviderRemoteTabs.sys.mjs b/browser/components/urlbar/UrlbarProviderRemoteTabs.sys.mjs @@ -206,7 +206,6 @@ export class UrlbarProviderRemoteTabs extends UrlbarProvider { } let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.REMOTE_TAB, source: UrlbarUtils.RESULT_SOURCE.TABS, payload: { diff --git a/browser/components/urlbar/UrlbarProviderRestrictKeywords.sys.mjs b/browser/components/urlbar/UrlbarProviderRestrictKeywords.sys.mjs @@ -70,7 +70,6 @@ export class UrlbarProviderRestrictKeywords extends UrlbarProvider { )?.icon; let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.RESTRICT, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, hideRowLabel: true, diff --git a/browser/components/urlbar/UrlbarProviderRestrictKeywordsAutofill.sys.mjs b/browser/components/urlbar/UrlbarProviderRestrictKeywordsAutofill.sys.mjs @@ -189,7 +189,6 @@ export class UrlbarProviderRestrictKeywordsAutofill extends UrlbarProvider { )?.icon; return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.RESTRICT, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, hideRowLabel: true, diff --git a/browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs b/browser/components/urlbar/UrlbarProviderSearchSuggestions.sys.mjs @@ -494,7 +494,6 @@ export class UrlbarProviderSearchSuggestions extends UrlbarProvider { try { results.push( new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.SEARCH, source: UrlbarUtils.RESULT_SOURCE.SEARCH, isRichSuggestion: !!entry.icon, @@ -638,7 +637,6 @@ export class UrlbarProviderSearchSuggestions extends UrlbarProvider { function makeFormHistoryResult(queryContext, engine, entry) { return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.SEARCH, source: UrlbarUtils.RESULT_SOURCE.HISTORY, payload: { diff --git a/browser/components/urlbar/UrlbarProviderSemanticHistorySearch.sys.mjs b/browser/components/urlbar/UrlbarProviderSemanticHistorySearch.sys.mjs @@ -139,7 +139,6 @@ export class UrlbarProviderSemanticHistorySearch extends UrlbarProvider { ) ) { const result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.HISTORY, payload: { @@ -202,7 +201,6 @@ export class UrlbarProviderSemanticHistorySearch extends UrlbarProvider { continue; } let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.TAB_SWITCH, source: UrlbarUtils.RESULT_SOURCE.TABS, payload: { diff --git a/browser/components/urlbar/UrlbarProviderTokenAliasEngines.sys.mjs b/browser/components/urlbar/UrlbarProviderTokenAliasEngines.sys.mjs @@ -123,7 +123,6 @@ export class UrlbarProviderTokenAliasEngines extends UrlbarProvider { engine.name != this._autofillData?.result.payload.engine ) { let result = new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.SEARCH, source: UrlbarUtils.RESULT_SOURCE.SEARCH, hideRowLabel: true, @@ -195,7 +194,6 @@ export class UrlbarProviderTokenAliasEngines extends UrlbarProvider { alias.substr(queryContext.searchString.length); let value = aliasPreservingUserCase + " "; return new lazy.UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.SEARCH, source: UrlbarUtils.RESULT_SOURCE.SEARCH, // We set suggestedIndex = 0 instead of the heuristic because we diff --git a/browser/components/urlbar/UrlbarResult.sys.mjs b/browser/components/urlbar/UrlbarResult.sys.mjs @@ -44,7 +44,6 @@ export class UrlbarResult { /** * @param {object} params - * @param {object} [params.queryContext] Used for highlighting. * @param {Values<typeof lazy.UrlbarUtils.RESULT_TYPE>} params.type * @param {Values<typeof lazy.UrlbarUtils.RESULT_SOURCE>} params.source * @param {UrlbarAutofillData} [params.autofill] @@ -63,12 +62,10 @@ export class UrlbarResult { * @param {boolean} [params.showFeedbackMenu] * @param {number} [params.suggestedIndex] * @param {Payload} [params.payload] - * @param {object} [params.payloadHighlights] * @param {Highlights} [params.highlights] * @param {boolean} [params.testForceNewContent] Used for test only. */ constructor({ - queryContext, type, source, autofill, @@ -87,7 +84,6 @@ export class UrlbarResult { showFeedbackMenu = false, suggestedIndex, payload, - payloadHighlights = {}, highlights = null, testForceNewContent, }) { @@ -111,29 +107,15 @@ export class UrlbarResult { throw new Error("Invalid result payload"); } - if (!payloadHighlights || typeof payloadHighlights != "object") { - throw new Error("Invalid result payload highlights"); - } - payload = Object.fromEntries( Object.entries(payload).filter(([_, v]) => v != undefined) ); if (highlights) { - if (!queryContext) { - throw new Error("queryContext is needed to highlight"); - } - this.#initPayloadAndHighlights({ - payload, - payloadHighlights, - tokens: queryContext.tokens, - highlightTargets: highlights, - }); this.#highlights = Object.freeze(highlights); } this.#payload = this.#validatePayload(payload); - this.#payloadHighlights = Object.freeze(payloadHighlights); this.#autofill = autofill; this.#exposureTelemetry = exposureTelemetry; @@ -268,10 +250,6 @@ export class UrlbarResult { return this.#payload; } - get payloadHighlights() { - return this.#payloadHighlights; - } - get testForceNewContent() { return this.#testForceNewContent; } @@ -457,37 +435,6 @@ export class UrlbarResult { return payload; } - #initPayloadAndHighlights({ - payload, - payloadHighlights, - tokens, - highlightTargets, - }) { - if (!tokens?.length) { - return; - } - - for (let [name, highlightType] of Object.entries(highlightTargets)) { - if (!highlightType) { - continue; - } - - let value = payload[name]; - if (!value) { - continue; - } - - let highlights = Array.isArray(value) - ? value.map(subval => - lazy.UrlbarUtils.getTokenMatches(tokens, subval, highlightType) - ) - : lazy.UrlbarUtils.getTokenMatches(tokens, value || "", highlightType); - if (highlights.length) { - payloadHighlights[name] = highlights; - } - } - } - static _dynamicResultTypesByName = new Map(); /** @@ -579,7 +526,6 @@ export class UrlbarResult { #showFeedbackMenu; #suggestedIndex; #payload; - #payloadHighlights; #highlights; #displayValuesCache; #testForceNewContent; diff --git a/browser/components/urlbar/UrlbarUtils.sys.mjs b/browser/components/urlbar/UrlbarUtils.sys.mjs @@ -1741,7 +1741,7 @@ export var UrlbarUtils = { * The text content to give the node. * @param {Array} highlights * Array of highlights as returned by `UrlbarUtils.getTokenMatches()` or - * `UrlbarResult.payloadHighlights`. + * `UrlbarResult.getDisplayableValueAndHighlights()`. */ addTextContentWithHighlights(parentNode, textContent, highlights) { parentNode.textContent = ""; @@ -3388,7 +3388,7 @@ export class L10nCache { * If this is set, apply substring highlighting to the corresponding l10n * arguments in `args`. Each value in this object should be an array of * highlights as returned by `UrlbarUtils.getTokenMatches()` or - * `UrlbarResult.payloadHighlights`. + * `UrlbarResult.getDisplayableValueAndHighlights()`. * @param {string} [options.attribute] * If the string applies to an attribute on the element, pass the name of * the attribute. The string in the Fluent file should define a value for diff --git a/browser/components/urlbar/private/AddonSuggestions.sys.mjs b/browser/components/urlbar/private/AddonSuggestions.sys.mjs @@ -88,7 +88,6 @@ export class AddonSuggestions extends SuggestProvider { } return new lazy.UrlbarResult({ - queryContext, type: lazy.UrlbarUtils.RESULT_TYPE.URL, source: lazy.UrlbarUtils.RESULT_SOURCE.SEARCH, isBestMatch: true, diff --git a/browser/components/urlbar/private/AmpSuggestions.sys.mjs b/browser/components/urlbar/private/AmpSuggestions.sys.mjs @@ -148,7 +148,6 @@ export class AmpSuggestions extends SuggestProvider { } return new lazy.UrlbarResult({ - queryContext, type: lazy.UrlbarUtils.RESULT_TYPE.URL, source: lazy.UrlbarUtils.RESULT_SOURCE.SEARCH, isRichSuggestion: true, diff --git a/browser/components/urlbar/private/DynamicSuggestions.sys.mjs b/browser/components/urlbar/private/DynamicSuggestions.sys.mjs @@ -109,7 +109,6 @@ export class DynamicSuggestions extends SuggestProvider { let resultProperties = { ...result }; delete resultProperties.payload; return new lazy.UrlbarResult({ - queryContext, type: lazy.UrlbarUtils.RESULT_TYPE.URL, source: lazy.UrlbarUtils.RESULT_SOURCE.SEARCH, ...resultProperties, diff --git a/browser/components/urlbar/private/ImportantDatesSuggestions.sys.mjs b/browser/components/urlbar/private/ImportantDatesSuggestions.sys.mjs @@ -212,7 +212,6 @@ export class ImportantDatesSuggestions extends SuggestProvider { let dateString = this.#formatDateOrRange(eventDateOrRange); return new lazy.UrlbarResult({ - queryContext, type: lazy.UrlbarUtils.RESULT_TYPE.SEARCH, source: lazy.UrlbarUtils.RESULT_SOURCE.SEARCH, isBestMatch: true, diff --git a/browser/components/urlbar/private/MDNSuggestions.sys.mjs b/browser/components/urlbar/private/MDNSuggestions.sys.mjs @@ -56,7 +56,6 @@ export class MDNSuggestions extends SuggestProvider { url.searchParams.set("utm_content", "treatment"); return new lazy.UrlbarResult({ - queryContext, type: lazy.UrlbarUtils.RESULT_TYPE.URL, source: lazy.UrlbarUtils.RESULT_SOURCE.OTHER_NETWORK, isBestMatch: true, diff --git a/browser/components/urlbar/private/WikipediaSuggestions.sys.mjs b/browser/components/urlbar/private/WikipediaSuggestions.sys.mjs @@ -49,7 +49,6 @@ export class WikipediaSuggestions extends SuggestProvider { makeResult(queryContext, suggestion) { return new lazy.UrlbarResult({ - queryContext, type: lazy.UrlbarUtils.RESULT_TYPE.URL, source: lazy.UrlbarUtils.RESULT_SOURCE.SEARCH, payload: { diff --git a/browser/components/urlbar/private/YelpSuggestions.sys.mjs b/browser/components/urlbar/private/YelpSuggestions.sys.mjs @@ -230,7 +230,6 @@ export class YelpSuggestions extends SuggestProvider { } return new lazy.UrlbarResult({ - queryContext, type: lazy.UrlbarUtils.RESULT_TYPE.URL, source: lazy.UrlbarUtils.RESULT_SOURCE.SEARCH, ...resultProperties, diff --git a/browser/components/urlbar/tests/browser/browser_bestMatch.js b/browser/components/urlbar/tests/browser/browser_bestMatch.js @@ -178,7 +178,6 @@ async function withProvider(result, callback) { function makeBestMatchResult(payloadExtra = {}) { return new UrlbarResult({ - queryContext: { tokens: [] }, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.SEARCH, isBestMatch: true, diff --git a/browser/components/urlbar/tests/browser/browser_dynamicResults.js b/browser/components/urlbar/tests/browser/browser_dynamicResults.js @@ -573,8 +573,8 @@ add_task(async function highlighting() { */ class TestHighlightProvider extends TestProvider { startQuery(context, addCallback) { + this._tokens = context.tokens; let result = new UrlbarResult({ - queryContext: context, type: UrlbarUtils.RESULT_TYPE.DYNAMIC, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, suggestedIndex: 1, @@ -590,11 +590,12 @@ add_task(async function highlighting() { } getViewUpdate(result, _idsByName) { + let { value: textContent, highlights } = + result.getDisplayableValueAndHighlights("text", { + tokens: this._tokens, + }); return { - text: { - textContent: result.payload.text, - highlights: result.payloadHighlights.text, - }, + text: { textContent, highlights }, }; } } diff --git a/browser/components/urlbar/tests/browser/browser_results_format_displayValue.js b/browser/components/urlbar/tests/browser/browser_results_format_displayValue.js @@ -10,7 +10,6 @@ add_task(async function test_receive_punycode_result() { class ResultWithHighlightsProvider extends UrlbarTestUtils.TestProvider { startQuery(context, addCallback) { let result = new UrlbarResult({ - queryContext: context, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.HISTORY, suggestedIndex: 0, diff --git a/browser/components/urlbar/tests/unit/head.js b/browser/components/urlbar/tests/unit/head.js @@ -456,7 +456,6 @@ function makeBookmarkResult( } ) { return new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source, heuristic, @@ -501,7 +500,6 @@ function makeBookmarkResult( */ function makeFormHistoryResult(queryContext, { suggestion, engineName }) { return new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.SEARCH, source: UrlbarUtils.RESULT_SOURCE.HISTORY, payload: { @@ -544,7 +542,6 @@ function makeOmniboxResult( { content, description, keyword, heuristic = false } ) { return new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.OMNIBOX, source: UrlbarUtils.RESULT_SOURCE.ADDON, heuristic, @@ -586,7 +583,6 @@ function makeTabSwitchResult( { uri, title, iconUri, userContextId, tabGroup } ) { return new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.TAB_SWITCH, source: UrlbarUtils.RESULT_SOURCE.TABS, payload: { @@ -630,7 +626,6 @@ function makeKeywordSearchResult( { uri, keyword, title, iconUri, postData, heuristic = false } ) { return new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.KEYWORD, source: UrlbarUtils.RESULT_SOURCE.BOOKMARKS, heuristic, @@ -691,7 +686,6 @@ function makeRemoteTabResult( } return new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.REMOTE_TAB, source: UrlbarUtils.RESULT_SOURCE.TABS, payload, @@ -838,7 +832,6 @@ function makeSearchResult( } return new UrlbarResult({ - queryContext, type, source, heuristic, @@ -932,7 +925,6 @@ function makeVisitResult( } return new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source, heuristic, diff --git a/browser/components/urlbar/tests/unit/test_UrlbarResult_getDisplayableValueAndHighlights.js b/browser/components/urlbar/tests/unit/test_UrlbarResult_getDisplayableValueAndHighlights.js @@ -6,7 +6,6 @@ add_task(function type_typed() { let queryContext = createContext("test"); let result = new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, payload: { @@ -31,7 +30,6 @@ add_task(function type_typed() { add_task(function type_suggested() { let queryContext = createContext("test"); let result = new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.SEARCH, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, payload: { @@ -56,7 +54,6 @@ add_task(function type_suggested() { add_task(function type_all() { let queryContext = createContext("test"); let result = new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, payload: { @@ -81,7 +78,6 @@ add_task(function type_all() { add_task(function option_isURL() { let queryContext = createContext("test"); let result = new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, payload: { @@ -106,7 +102,6 @@ add_task(function option_isURL() { add_task(function option_no_tokens() { let queryContext = createContext(""); let result = new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, payload: { @@ -130,7 +125,6 @@ add_task(function option_no_tokens() { add_task(function option_nothing() { let result = new UrlbarResult({ - queryContext: createContext(""), type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, payload: { @@ -154,7 +148,6 @@ add_task(function option_nothing() { add_task(function invalid_target() { let queryContext = createContext("test"); let result = new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, payload: { @@ -179,7 +172,6 @@ add_task(function invalid_target() { add_task(function cache() { let queryContext = createContext("test"); let result = new UrlbarResult({ - queryContext, type: UrlbarUtils.RESULT_TYPE.URL, source: UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL, payload: {