From 8e7a61886ba586eacda5b2fbecdf6e9953b99948 Mon Sep 17 00:00:00 2001 From: Dorel Luca Date: Thu, 23 Aug 2018 23:45:02 +0300 Subject: [PATCH] Backed out changeset d47a2f5db828 (bug 1481199) browser/base/content/test/urlbar/browser_autocomplete_a11y_label.js. CLOSED TREE --- browser/base/content/browser-pageActions.js | 2 +- .../content/test/about/browser_aboutHome_search_POST.js | 2 +- browser/base/content/test/about/head.js | 2 +- .../content/test/general/browser_keywordSearch_postData.js | 2 +- .../browser_ext_webNavigation_urlbar_transitions.js | 2 +- browser/components/search/test/browser_426329.js | 2 +- browser/components/search/test/browser_483086.js | 4 ++-- browser/components/search/test/browser_addEngine.js | 2 +- browser/components/search/test/browser_contextmenu.js | 2 +- browser/components/search/test/browser_healthreport.js | 2 +- .../search/test/browser_hiddenOneOffs_cleanup.js | 2 +- browser/components/search/test/head.js | 2 +- browser/modules/test/browser/browser_ContentSearch.js | 2 +- .../test/browser/browser_UsageTelemetry_searchbar.js | 6 +++--- .../modules/test/browser/browser_UsageTelemetry_urlbar.js | 2 +- mobile/android/chrome/content/browser.js | 2 +- netwerk/base/nsIBrowserSearchService.idl | 7 +++++-- .../places/tests/unifiedcomplete/head_autocomplete.js | 2 +- .../components/processsingleton/MainProcessSingleton.js | 2 +- toolkit/components/search/nsSearchService.js | 4 ++-- toolkit/components/search/tests/xpcshell/head_search.js | 3 ++- .../search/tests/xpcshell/test_addEngineWithExtensionID.js | 2 +- .../search/tests/xpcshell/test_addEngine_callback.js | 6 +++--- .../components/search/tests/xpcshell/test_multipleIcons.js | 2 +- .../components/search/tests/xpcshell/test_notifications.js | 2 +- .../telemetry/tests/unit/test_TelemetryEnvironment.js | 2 +- 26 files changed, 37 insertions(+), 33 deletions(-) diff --git a/browser/base/content/browser-pageActions.js b/browser/base/content/browser-pageActions.js index 373903db6e4e..2166637027b8 100644 --- a/browser/base/content/browser-pageActions.js +++ b/browser/base/content/browser-pageActions.js @@ -1166,7 +1166,7 @@ BrowserPageActions.addSearchEngine = { }, _installEngine(uri, image) { - Services.search.addEngine(uri, image, false, { + Services.search.addEngine(uri, null, image, false, { onSuccess: engine => { showBrowserPageActionFeedback(this.action); }, diff --git a/browser/base/content/test/about/browser_aboutHome_search_POST.js b/browser/base/content/test/about/browser_aboutHome_search_POST.js index a8e99ade4a18..7acc733f6385 100644 --- a/browser/base/content/test/about/browser_aboutHome_search_POST.js +++ b/browser/base/content/test/about/browser_aboutHome_search_POST.js @@ -54,7 +54,7 @@ add_task(async function() { }; Services.obs.addObserver(searchObserver, "browser-search-engine-modified"); Services.search.addEngine("http://test:80/browser/browser/base/content/test/about/POSTSearchEngine.xml", - null, false); + null, null, false); }); }); }); diff --git a/browser/base/content/test/about/head.js b/browser/base/content/test/about/head.js index f79a4d356a00..ca3fdf5ff500 100644 --- a/browser/base/content/test/about/head.js +++ b/browser/base/content/test/about/head.js @@ -167,7 +167,7 @@ function promiseNewEngine(basename) { info("Waiting for engine to be added: " + basename); return new Promise((resolve, reject) => { let url = getRootDirectory(gTestPath) + basename; - Services.search.addEngine(url, "", false, { + Services.search.addEngine(url, null, "", false, { onSuccess(engine) { info("Search engine added: " + basename); registerCleanupFunction(() => { diff --git a/browser/base/content/test/general/browser_keywordSearch_postData.js b/browser/base/content/test/general/browser_keywordSearch_postData.js index 0a467c10fd20..79e5bae4a6c2 100644 --- a/browser/base/content/test/general/browser_keywordSearch_postData.js +++ b/browser/base/content/test/general/browser_keywordSearch_postData.js @@ -50,7 +50,7 @@ function test() { }); Services.search.addEngine("http://test:80/browser/browser/base/content/test/general/POSTSearchEngine.xml", - null, false); + null, null, false); } var gCurrTest; diff --git a/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js b/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js index b92820dfea67..2df39f0a2639 100644 --- a/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js +++ b/browser/components/extensions/test/browser/browser_ext_webNavigation_urlbar_transitions.js @@ -42,7 +42,7 @@ function addSearchEngine(basename) { return new Promise((resolve, reject) => { info("Waiting for engine to be added: " + basename); let url = getRootDirectory(gTestPath) + basename; - Services.search.addEngine(url, "", false, { + Services.search.addEngine(url, null, "", false, { onSuccess: (engine) => { info(`Search engine added: ${basename}`); registerCleanupFunction(() => Services.search.removeEngine(engine)); diff --git a/browser/components/search/test/browser_426329.js b/browser/components/search/test/browser_426329.js index e257f8992ff0..d87a4cb56269 100644 --- a/browser/components/search/test/browser_426329.js +++ b/browser/components/search/test/browser_426329.js @@ -83,7 +83,7 @@ function promiseSetEngine() { Services.obs.addObserver(observer, "browser-search-engine-modified"); ss.addEngine("http://mochi.test:8888/browser/browser/components/search/test/426329.xml", - "data:image/x-icon,%00", false); + null, "data:image/x-icon,%00", false); }); } diff --git a/browser/components/search/test/browser_483086.js b/browser/components/search/test/browser_483086.js index af6fdcb66c91..a606c8879aa6 100644 --- a/browser/components/search/test/browser_483086.js +++ b/browser/components/search/test/browser_483086.js @@ -24,7 +24,7 @@ function test() { Services.obs.addObserver(observer, "browser-search-engine-modified"); gSS.addEngine("http://mochi.test:8888/browser/browser/components/search/test/483086-1.xml", - "data:image/x-icon;%00", false); + null, "data:image/x-icon;%00", false); } function test2() { @@ -45,5 +45,5 @@ function test2() { Services.obs.addObserver(observer, "browser-search-engine-modified"); gSS.addEngine("http://mochi.test:8888/browser/browser/components/search/test/483086-2.xml", - "data:image/x-icon;%00", false); + null, "data:image/x-icon;%00", false); } diff --git a/browser/components/search/test/browser_addEngine.js b/browser/components/search/test/browser_addEngine.js index cf683afb8c79..e72e4c9110fa 100644 --- a/browser/components/search/test/browser_addEngine.js +++ b/browser/components/search/test/browser_addEngine.js @@ -50,7 +50,7 @@ var gTests = [ Services.obs.addObserver(observer, "browser-search-engine-modified"); gSS.addEngine("http://mochi.test:8888/browser/browser/components/search/test/testEngine.xml", - "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABGklEQVQoz2NgGB6AnZ1dUlJSXl4eSDIyMhLW4Ovr%2B%2Fr168uXL69Zs4YoG%2BLi4i5dusTExMTGxsbNzd3f37937976%2BnpmZmagbHR09J49e5YvX66kpATVEBYW9ubNm2nTphkbG7e2tp44cQLIuHfvXm5urpaWFlDKysqqu7v73LlzECMYIiIiHj58mJCQoKKicvXq1bS0NKBgW1vbjh074uPjgeqAXE1NzSdPnvDz84M0AEUvXLgAsW379u1z5swBen3jxo2zZ892cHB4%2BvQp0KlAfwI1cHJyghQFBwfv2rULokFXV%2FfixYu7d%2B8GGqGgoMDKyrpu3br9%2B%2FcDuXl5eVA%2FAEWBfoWHAdAYoNuAYQ0XAeoUERFhGDYAAPoUaT2dfWJuAAAAAElFTkSuQmCC", + null, "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAABGklEQVQoz2NgGB6AnZ1dUlJSXl4eSDIyMhLW4Ovr%2B%2Fr168uXL69Zs4YoG%2BLi4i5dusTExMTGxsbNzd3f37937976%2BnpmZmagbHR09J49e5YvX66kpATVEBYW9ubNm2nTphkbG7e2tp44cQLIuHfvXm5urpaWFlDKysqqu7v73LlzECMYIiIiHj58mJCQoKKicvXq1bS0NKBgW1vbjh074uPjgeqAXE1NzSdPnvDz84M0AEUvXLgAsW379u1z5swBen3jxo2zZ892cHB4%2BvQp0KlAfwI1cHJyghQFBwfv2rULokFXV%2FfixYu7d%2B8GGqGgoMDKyrpu3br9%2B%2FcDuXl5eVA%2FAEWBfoWHAdAYoNuAYQ0XAeoUERFhGDYAAPoUaT2dfWJuAAAAAElFTkSuQmCC", false); }, added(engine) { diff --git a/browser/components/search/test/browser_contextmenu.js b/browser/components/search/test/browser_contextmenu.js index 845043ef817e..7f385501339d 100644 --- a/browser/components/search/test/browser_contextmenu.js +++ b/browser/components/search/test/browser_contextmenu.js @@ -49,7 +49,7 @@ add_task(async function() { Services.obs.addObserver(observer, "browser-search-engine-modified"); ss.addEngine("resource://search-plugins/testEngine_mozsearch.xml", - "data:image/x-icon,%00", false); + null, "data:image/x-icon,%00", false); }); contextMenu = document.getElementById("contentAreaContextMenu"); diff --git a/browser/components/search/test/browser_healthreport.js b/browser/components/search/test/browser_healthreport.js index daea794f32f6..a1b514754e23 100644 --- a/browser/components/search/test/browser_healthreport.js +++ b/browser/components/search/test/browser_healthreport.js @@ -78,7 +78,7 @@ function test() { Services.obs.addObserver(observer, "browser-search-engine-modified"); gCUITestUtils.addSearchBar().then(function() { Services.search.addEngine("http://mochi.test:8888/browser/browser/components/search/test/testEngine.xml", - "data:image/x-icon,%00", false); + null, "data:image/x-icon,%00", false); }); } diff --git a/browser/components/search/test/browser_hiddenOneOffs_cleanup.js b/browser/components/search/test/browser_hiddenOneOffs_cleanup.js index aba2a46951e9..d1e9907a01a1 100644 --- a/browser/components/search/test/browser_hiddenOneOffs_cleanup.js +++ b/browser/components/search/test/browser_hiddenOneOffs_cleanup.js @@ -9,7 +9,7 @@ function promiseNewEngine(basename) { Services.search.init({ onInitComplete() { let url = getRootDirectory(gTestPath) + basename; - Services.search.addEngine(url, "", false, { + Services.search.addEngine(url, null, "", false, { onSuccess(engine) { info("Search engine added: " + basename); resolve(engine); diff --git a/browser/components/search/test/head.js b/browser/components/search/test/head.js index 61663bb23a30..1613336f9823 100644 --- a/browser/components/search/test/head.js +++ b/browser/components/search/test/head.js @@ -61,7 +61,7 @@ function promiseNewEngine(basename, options = {}) { onInitComplete() { let url = getRootDirectory(options.testPath || gTestPath) + basename; let current = Services.search.currentEngine; - Services.search.addEngine(url, options.iconURL || "", false, { + Services.search.addEngine(url, null, options.iconURL || "", false, { onSuccess(engine) { info("Search engine added: " + basename); if (setAsCurrent) { diff --git a/browser/modules/test/browser/browser_ContentSearch.js b/browser/modules/test/browser/browser_ContentSearch.js index 501db3a44a46..575f609adc49 100644 --- a/browser/modules/test/browser/browser_ContentSearch.js +++ b/browser/modules/test/browser/browser_ContentSearch.js @@ -335,7 +335,7 @@ function waitForNewEngine(basename, numImages) { // Wait for addEngine(). let addDeferred = PromiseUtils.defer(); let url = getRootDirectory(gTestPath) + basename; - Services.search.addEngine(url, "", false, { + Services.search.addEngine(url, null, "", false, { onSuccess(engine) { info("Search engine added: " + basename); addDeferred.resolve(engine); diff --git a/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js b/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js index 3b62ce0dd9e8..6440881de906 100644 --- a/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js +++ b/browser/modules/test/browser/browser_UsageTelemetry_searchbar.js @@ -186,7 +186,7 @@ add_task(async function test_oneOff_enterSelection() { // for this test. const url = getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml"; let suggestionEngine = await new Promise((resolve, reject) => { - Services.search.addEngine(url, "", false, { + Services.search.addEngine(url, null, "", false, { onSuccess(engine) { resolve(engine); }, onError() { reject(); } }); @@ -254,7 +254,7 @@ add_task(async function test_suggestion_click() { // for this test. const url = getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml"; let suggestionEngine = await new Promise((resolve, reject) => { - Services.search.addEngine(url, "", false, { + Services.search.addEngine(url, null, "", false, { onSuccess(engine) { resolve(engine); }, onError() { reject(); } }); @@ -311,7 +311,7 @@ add_task(async function test_suggestion_enterSelection() { // for this test. const url = getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml"; let suggestionEngine = await new Promise((resolve, reject) => { - Services.search.addEngine(url, "", false, { + Services.search.addEngine(url, null, "", false, { onSuccess(engine) { resolve(engine); }, onError() { reject(); } }); diff --git a/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js b/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js index b4cc17ca73e1..2c0250fc3cc1 100644 --- a/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js +++ b/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js @@ -82,7 +82,7 @@ function clickURLBarSuggestion(entryName, button = 1) { async function withNewSearchEngine(taskFn) { const url = getRootDirectory(gTestPath) + "usageTelemetrySearchSuggestions.xml"; let suggestionEngine = await new Promise((resolve, reject) => { - Services.search.addEngine(url, "", false, { + Services.search.addEngine(url, null, "", false, { onSuccess(engine) { resolve(engine); }, onError() { reject(); } }); diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 76bfd0e6256b..5ad5d9838d05 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -5990,7 +5990,7 @@ var SearchEngines = { }, addOpenSearchEngine: function addOpenSearchEngine(engine) { - Services.search.addEngine(engine.url, engine.iconURL, false, { + Services.search.addEngine(engine.url, Ci.nsISearchEngine.DATA_XML, engine.iconURL, false, { onSuccess: function() { // Display a toast confirming addition of new search engine. Snackbars.show(Strings.browser.formatStringFromName("alertSearchEngineAddedToast", [engine.title], 1), Snackbars.LENGTH_LONG); diff --git a/netwerk/base/nsIBrowserSearchService.idl b/netwerk/base/nsIBrowserSearchService.idl index 58761689a439..8bc9bebb6395 100644 --- a/netwerk/base/nsIBrowserSearchService.idl +++ b/netwerk/base/nsIBrowserSearchService.idl @@ -295,6 +295,9 @@ interface nsIBrowserSearchService : nsISupports * @param engineURL * The URL to the search engine's description file. * + * @param dataType + * Obsolete, the value is ignored. + * * @param iconURL * A URL string to an icon file to be used as the search engine's * icon. This value may be overridden by an icon specified in the @@ -317,8 +320,8 @@ interface nsIBrowserSearchService : nsISupports * @throws NS_ERROR_FAILURE if the description file cannot be successfully * loaded. */ - void addEngine(in AString engineURL, in AString iconURL, in boolean confirm, - [optional] in nsISearchInstallCallback callback, + void addEngine(in AString engineURL, in long dataType, in AString iconURL, + in boolean confirm, [optional] in nsISearchInstallCallback callback, [optional] in AString extensionID); /** diff --git a/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js b/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js index f7c9b6c204d9..ee17fd58e4d5 100644 --- a/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js +++ b/toolkit/components/places/tests/unifiedcomplete/head_autocomplete.js @@ -462,7 +462,7 @@ function addTestEngine(basename, httpServer = undefined) { }, "browser-search-engine-modified"); info("Adding engine from URL: " + dataUrl + basename); - Services.search.addEngine(dataUrl + basename, null, false); + Services.search.addEngine(dataUrl + basename, null, null, false); }); } diff --git a/toolkit/components/processsingleton/MainProcessSingleton.js b/toolkit/components/processsingleton/MainProcessSingleton.js index 61dbd0895b7e..dc71dc4ff12c 100644 --- a/toolkit/components/processsingleton/MainProcessSingleton.js +++ b/toolkit/components/processsingleton/MainProcessSingleton.js @@ -53,7 +53,7 @@ MainProcessSingleton.prototype = { if (status != Cr.NS_OK) return; - Services.search.addEngine(engineURL.spec, iconURL ? iconURL.spec : null, true); + Services.search.addEngine(engineURL.spec, null, iconURL ? iconURL.spec : null, true); }); }, diff --git a/toolkit/components/search/nsSearchService.js b/toolkit/components/search/nsSearchService.js index bd4676274a15..9d008ded66d1 100644 --- a/toolkit/components/search/nsSearchService.js +++ b/toolkit/components/search/nsSearchService.js @@ -3850,8 +3850,8 @@ SearchService.prototype = { } }, - addEngine: function SRCH_SVC_addEngine(aEngineURL, aIconURL, aConfirm, - aCallback, aExtensionID) { + addEngine: function SRCH_SVC_addEngine(aEngineURL, aDataType, aIconURL, + aConfirm, aCallback, aExtensionID) { LOG("addEngine: Adding \"" + aEngineURL + "\"."); this._ensureInitialized(); try { diff --git a/toolkit/components/search/tests/xpcshell/head_search.js b/toolkit/components/search/tests/xpcshell/head_search.js index c7c93281cae7..b9f73eec5786 100644 --- a/toolkit/components/search/tests/xpcshell/head_search.js +++ b/toolkit/components/search/tests/xpcshell/head_search.js @@ -415,7 +415,8 @@ var addTestEngines = async function(aItems) { }, "browser-search-engine-modified"); if (item.xmlFileName) { - Services.search.addEngine(gDataUrl + item.xmlFileName, null, false); + Services.search.addEngine(gDataUrl + item.xmlFileName, + null, null, false); } else { Services.search.addEngineWithDetails(item.name, ...item.details); } diff --git a/toolkit/components/search/tests/xpcshell/test_addEngineWithExtensionID.js b/toolkit/components/search/tests/xpcshell/test_addEngineWithExtensionID.js index 4019666e9b44..015ac2bfaf8d 100644 --- a/toolkit/components/search/tests/xpcshell/test_addEngineWithExtensionID.js +++ b/toolkit/components/search/tests/xpcshell/test_addEngineWithExtensionID.js @@ -40,7 +40,7 @@ add_test(function test_addEngineWithExtensionID() { } }; Services.search.addEngine(gDataUrl + "engine.xml", null, - false, searchCallback, kExtensionID2); + null, false, searchCallback, kExtensionID2); }); function run_test() { diff --git a/toolkit/components/search/tests/xpcshell/test_addEngine_callback.js b/toolkit/components/search/tests/xpcshell/test_addEngine_callback.js index d15986147f8f..256e949516a7 100644 --- a/toolkit/components/search/tests/xpcshell/test_addEngine_callback.js +++ b/toolkit/components/search/tests/xpcshell/test_addEngine_callback.js @@ -50,7 +50,7 @@ add_test(function simple_callback_test() { } }; Services.search.addEngine(gDataUrl + "engine.xml", null, - false, searchCallback); + null, false, searchCallback); }); // Test of the search callback on duplicate engine failures @@ -67,7 +67,7 @@ add_test(function duplicate_failure_test() { }; // Re-add the same engine added in the previous test Services.search.addEngine(gDataUrl + "engine.xml", null, - false, searchCallback); + null, false, searchCallback); }); // Test of the search callback on failure to load the engine failures @@ -84,7 +84,7 @@ add_test(function load_failure_test() { }; // Try adding an engine that doesn't exist Services.search.addEngine("http://invalid/data/engine.xml", null, - false, searchCallback); + null, false, searchCallback); }); function run_test() { diff --git a/toolkit/components/search/tests/xpcshell/test_multipleIcons.js b/toolkit/components/search/tests/xpcshell/test_multipleIcons.js index 1190c035f639..04ae7af02254 100644 --- a/toolkit/components/search/tests/xpcshell/test_multipleIcons.js +++ b/toolkit/components/search/tests/xpcshell/test_multipleIcons.js @@ -48,7 +48,7 @@ add_task(async function test_multipleIcons() { add_task(async function test_icon_not_in_file() { let engineUrl = gDataUrl + "engine-fr.xml"; let engine = await new Promise((resolve, reject) => { - Services.search.addEngine(engineUrl, "data:image/x-icon;base64,ico16", + Services.search.addEngine(engineUrl, null, "data:image/x-icon;base64,ico16", false, {onSuccess: resolve, onError: reject}); }); diff --git a/toolkit/components/search/tests/xpcshell/test_notifications.js b/toolkit/components/search/tests/xpcshell/test_notifications.js index 1b325d0edacc..3ae78a27b2a7 100644 --- a/toolkit/components/search/tests/xpcshell/test_notifications.js +++ b/toolkit/components/search/tests/xpcshell/test_notifications.js @@ -66,5 +66,5 @@ function run_test() { Services.obs.addObserver(search_observer, "browser-search-engine-modified"); - Services.search.addEngine(gDataUrl + "engine.xml", null, false); + Services.search.addEngine(gDataUrl + "engine.xml", null, null, false); } diff --git a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js index f70e551be3e8..340bfd851be7 100644 --- a/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js +++ b/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js @@ -1610,7 +1610,7 @@ add_task(async function test_defaultSearchEngine() { } }, "browser-search-engine-modified"); Services.search.addEngine("file://" + do_get_cwd().path + "/engine.xml", - null, false); + null, null, false); }); Services.search.defaultEngine = engine; await promise;