fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

Bug 41835: Remove Twitter, Yahoo, and YouTube.

browser/components/search/extensions/twitter/manifest.json

-{
-  "name": "Twitter",
-  "description": "Realtime Twitter Search",
-  "manifest_version": 2,
-  "version": "1.0",
-  "applications": {
-    "gecko": {
-      "id": "twitter@search.mozilla.org"
-    }
-  },
-  "hidden": true,
-  "icons": {
-    "16": "favicon.ico"
-  },
-  "web_accessible_resources": [
-    "favicon.ico"
-  ],
-  "chrome_settings_overrides": {
-    "search_provider": {
-      "name": "Twitter",
-      "search_url": "https://twitter.com/search",
-      "search_form": "https://twitter.com/search?q={searchTerms}&partner=Firefox&source=desktop-search",
-      "search_url_get_params": "q={searchTerms}&partner=Firefox&source=desktop-search"
-    }
-  }
-}
\ No newline at end of file

browser/components/search/extensions/yahoo/manifest.json

-{
-  "name": "Yahoo",
-  "description": "Yahoo Search",
-  "manifest_version": 2,
-  "version": "1.0",
-  "applications": {
-    "gecko": {
-      "id": "yahoo@search.mozilla.org"
-    }
-  },
-  "hidden": true,
-  "icons": {
-    "16": "favicon.ico"
-  },
-  "web_accessible_resources": [
-    "favicon.ico"
-  ],
-  "chrome_settings_overrides": {
-    "search_provider": {
-      "name": "Yahoo",
-      "search_url": "https://search.yahoo.com/yhs/search",
-      "search_form": "https://search.yahoo.com/yhs/search?p={searchTerms}&ei=UTF-8&hspart=mozilla",
-      "search_url_get_params": "p={searchTerms}&ei=UTF-8&hspart=mozilla",
-      "suggest_url": "https://search.yahoo.com/sugg/ff",
-      "suggest_url_get_params": "output=fxjson&appid=ffd&command={searchTerms}"
-    }
-  }
-}

browser/components/search/extensions/youtube/manifest.json

-{
-  "name": "YouTube",
-  "description": "YouTube - Videos",
-  "manifest_version": 2,
-  "version": "1.0",
-  "applications": {
-    "gecko": {
-      "id": "youtube@search.mozilla.org"
-    }
-  },
-  "hidden": true,
-  "icons": {
-    "16": "favicon.ico"
-  },
-  "web_accessible_resources": [
-    "favicon.ico"
-  ],
-  "chrome_settings_overrides": {
-    "search_provider": {
-      "name": "YouTube",
-      "search_url": "https://www.youtube.com/results?search_query={searchTerms}&search=Search",
-      "search_form": "https://www.youtube.com/index",
-      "suggest_url": "https://suggestqueries.google.com/complete/search?output=firefox&ds=yt&q={searchTerms}"
-    }
-  }
-}
\ No newline at end of file

toolkit/components/search/SearchService.sys.mjs

@@ -2280,14 +2280,10 @@ export class SearchService {
   async _fetchEngineSelectorEngines() {
     const engines = [
       { webExtension: { id: "ddg@search.mozilla.org" }, orderHint: 100 },
-      { webExtension: { id: "youtube@search.mozilla.org" }, orderHint: 90 },
-      { webExtension: { id: "google@search.mozilla.org" }, orderHint: 80 },
-      { webExtension: { id: "ddg-onion@search.mozilla.org" }, orderHint: 70 },
-      { webExtension: { id: "startpage@search.mozilla.org" }, orderHint: 60 },
-      { webExtension: { id: "startpage-onion@search.mozilla.org" }, orderHint: 50 },
-      { webExtension: { id: "twitter@search.mozilla.org" }, orderHint: 40 },
-      { webExtension: { id: "wikipedia@search.mozilla.org" }, orderHint: 30 },
-      { webExtension: { id: "yahoo@search.mozilla.org" }, orderHint: 20 },
+      { webExtension: { id: "ddg-onion@search.mozilla.org" }, orderHint: 90 },
+      { webExtension: { id: "startpage@search.mozilla.org" }, orderHint: 80 },
+      { webExtension: { id: "startpage-onion@search.mozilla.org" }, orderHint: 70 },
+      { webExtension: { id: "wikipedia@search.mozilla.org" }, orderHint: 60 },
     ];
 
     for (let e of engines) {