[tbb-commits] [tor-browser/tor-browser-84.0-10.5-2] Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

Fri Dec 11 18:23:46 UTC 2020

commit 1e936d3db79ab47a4d749ca6c21cca9f47f57932
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri May 5 03:41:57 2017 -0700

    Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
    
    eBay and Amazon don't treat Tor users very well. Accounts often get locked and
    payments reversed.
    
    Also:
    Bug 16322: Update DuckDuckGo search engine
    
    We are replacing the clearnet URL with an onion service one (thanks to a
    patch by a cypherpunk) and are removing the duplicated DDG search
    engine. Duplicating DDG happend due to bug 1061736 where Mozilla
    included DDG itself into Firefox. Interestingly, this caused breaking
    the DDG search if JavaScript is disabled as the Mozilla engine, which
    gets loaded earlier, does not use the html version of the search page.
    Moreover, the Mozilla engine tracked where the users were searching from
    by adding a respective parameter to the search query. We got rid of that
    feature as well.
    
    Also:
    This fixes bug 20809: the DuckDuckGo team has changed its server-side
    code in a way that lets users with JavaScript enabled use the default
    landing page while those without JavaScript available get redirected
    directly to the non-JS page. We adapt the search engine URLs
    accordingly.
    
    Also fixes bug 29798 by making sure we only specify the Google search
    engine we actually ship an .xml file for.
    
    Also regression tests.
---
 .../search/extensions/ddg-onion/favicon.ico        | Bin 0 -> 973 bytes
 .../search/extensions/ddg-onion/manifest.json      |  26 +++++++++++++
 .../components/search/extensions/ddg/favicon.ico   | Bin 5430 -> 0 bytes
 .../components/search/extensions/ddg/favicon.png   | Bin 0 -> 1150 bytes
 .../components/search/extensions/ddg/manifest.json |  42 +++------------------
 .../extensions/google/_locales/b-1-d/messages.json |  23 -----------
 .../extensions/google/_locales/b-1-e/messages.json |  23 -----------
 .../extensions/google/_locales/b-d/messages.json   |  23 -----------
 .../extensions/google/_locales/b-e/messages.json   |  23 -----------
 .../extensions/google/_locales/en/messages.json    |  24 ------------
 .../search/extensions/google/manifest.json         |  17 ++++-----
 .../search/extensions/startpage/favicon.png        | Bin 0 -> 1150 bytes
 .../search/extensions/startpage/manifest.json      |  26 +++++++++++++
 .../search/extensions/twitter/favicon.ico          | Bin 0 -> 1650 bytes
 .../search/extensions/twitter/manifest.json        |  26 +++++++++++++
 .../extensions/wikipedia/_locales/NN/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/NO/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/af/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/an/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ar/messages.json |  20 ----------
 .../wikipedia/_locales/ast/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/az/messages.json |  20 ----------
 .../wikipedia/_locales/be-tarask/messages.json     |  20 ----------
 .../extensions/wikipedia/_locales/be/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/bg/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/bn/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/br/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/bs/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ca/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/cy/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/cz/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/da/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/de/messages.json |  20 ----------
 .../wikipedia/_locales/dsb/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/el/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/en/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/eo/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/es/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/et/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/eu/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/fa/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/fi/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/fr/messages.json |  20 ----------
 .../wikipedia/_locales/fy-NL/messages.json         |  20 ----------
 .../wikipedia/_locales/ga-IE/messages.json         |  20 ----------
 .../extensions/wikipedia/_locales/gd/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/gl/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/gn/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/gu/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/he/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/hi/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/hr/messages.json |  20 ----------
 .../wikipedia/_locales/hsb/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/hu/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/hy/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ia/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/id/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/is/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/it/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ja/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ka/messages.json |  20 ----------
 .../wikipedia/_locales/kab/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/kk/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/km/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/kn/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/kr/messages.json |  20 ----------
 .../wikipedia/_locales/lij/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/lo/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/lt/messages.json |  20 ----------
 .../wikipedia/_locales/ltg/messages.json           |  20 ----------
 .../extensions/wikipedia/_locales/lv/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/mk/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/mr/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ms/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/my/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ne/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/nl/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/oc/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/pa/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/pl/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/pt/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/rm/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ro/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ru/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/si/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/sk/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/sl/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/sq/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/sr/messages.json |  20 ----------
 .../wikipedia/_locales/sv-SE/messages.json         |  20 ----------
 .../extensions/wikipedia/_locales/ta/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/te/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/th/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/tl/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/tr/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/uk/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/ur/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/uz/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/vi/messages.json |  20 ----------
 .../extensions/wikipedia/_locales/wo/messages.json |  20 ----------
 .../wikipedia/_locales/zh-CN/messages.json         |  20 ----------
 .../wikipedia/_locales/zh-TW/messages.json         |  20 ----------
 .../search/extensions/wikipedia/manifest.json      |  15 ++++----
 .../components/search/extensions/yahoo/favicon.ico | Bin 0 -> 5430 bytes
 .../search/extensions/yahoo/manifest.json          |  28 ++++++++++++++
 .../search/extensions/youtube/favicon.ico          | Bin 0 -> 1150 bytes
 .../search/extensions/youtube/manifest.json        |  26 +++++++++++++
 tbb-tests/browser_tor_omnibox.js                   |  14 +++++++
 toolkit/components/search/SearchService.jsm        |  28 ++++++--------
 109 files changed, 177 insertions(+), 1927 deletions(-)

diff --git a/browser/components/search/extensions/ddg-onion/favicon.ico b/browser/components/search/extensions/ddg-onion/favicon.ico
new file mode 100644
index 000000000000..13c325f6585f
Binary files /dev/null and b/browser/components/search/extensions/ddg-onion/favicon.ico differ
diff --git a/browser/components/search/extensions/ddg-onion/manifest.json b/browser/components/search/extensions/ddg-onion/manifest.json
new file mode 100644
index 000000000000..294496b78368
--- /dev/null
+++ b/browser/components/search/extensions/ddg-onion/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "DuckDuckGoOnion",
+  "description": "Duck Duck Go Onion",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "ddg-onion at search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.ico"
+  },
+  "web_accessible_resources": [
+    "favicon.ico"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "DuckDuckGoOnion",
+      "search_url": "https://3g2upl4pq6kufc4m.onion",
+      "search_form": "https://3g2upl4pq6kufc4m.onion",
+      "search_url_post_params": "q={searchTerms}"
+    }
+  }
+}
\ No newline at end of file
diff --git a/browser/components/search/extensions/ddg/favicon.ico b/browser/components/search/extensions/ddg/favicon.ico
deleted file mode 100644
index dda80dfd88d5..000000000000
Binary files a/browser/components/search/extensions/ddg/favicon.ico and /dev/null differ
diff --git a/browser/components/search/extensions/ddg/favicon.png b/browser/components/search/extensions/ddg/favicon.png
new file mode 100644
index 000000000000..c853b95b89ef
Binary files /dev/null and b/browser/components/search/extensions/ddg/favicon.png differ
diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json
index 782b860a679f..f6aacc3dd069 100644
--- a/browser/components/search/extensions/ddg/manifest.json
+++ b/browser/components/search/extensions/ddg/manifest.json
@@ -10,50 +10,18 @@
   },
   "hidden": true,
   "icons": {
-    "16": "favicon.ico"
+    "16": "favicon.png"
   },
   "web_accessible_resources": [
-    "favicon.ico"
+    "favicon.png"
   ],
   "chrome_settings_overrides": {
     "search_provider": {
       "keyword": ["@duckduckgo", "@ddg"],
       "name": "DuckDuckGo",
-      "search_url": "https://duckduckgo.com/",
-      "search_form": "https://duckduckgo.com/?q={searchTerms}",
-      "search_url_get_params": "q={searchTerms}",
-      "params": [
-        {
-          "name": "t",
-          "condition": "purpose",
-          "purpose": "contextmenu",
-          "value": "ffcm"
-        },
-        {
-          "name": "t",
-          "condition": "purpose",
-          "purpose": "keyword",
-          "value": "ffab"
-        },
-        {
-          "name": "t",
-          "condition": "purpose",
-          "purpose": "searchbar",
-          "value": "ffsb"
-        },
-        {
-          "name": "t",
-          "condition": "purpose",
-          "purpose": "homepage",
-          "value": "ffhp"
-        },
-        {
-          "name": "t",
-          "condition": "purpose",
-          "purpose": "newtab",
-          "value": "ffnt"
-        }
-      ],
+      "search_url": "https://duckduckgo.com",
+      "search_form": "https://duckduckgo.com",
+      "search_url_post_params": "q={searchTerms}",
       "suggest_url": "https://ac.duckduckgo.com/ac/",
       "suggest_url_get_params": "q={searchTerms}&type=list"
     }
diff --git a/browser/components/search/extensions/google/_locales/b-1-d/messages.json b/browser/components/search/extensions/google/_locales/b-1-d/messages.json
deleted file mode 100644
index 1b9d05307d64..000000000000
--- a/browser/components/search/extensions/google/_locales/b-1-d/messages.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com/search"
-  },
-  "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-1-d&q={searchTerms}"
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "client=firefox-b-1-d&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_us"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/b-1-e/messages.json b/browser/components/search/extensions/google/_locales/b-1-e/messages.json
deleted file mode 100644
index b470cd844331..000000000000
--- a/browser/components/search/extensions/google/_locales/b-1-e/messages.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com/search"
-  },
-  "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-1-e&q={searchTerms}"
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "client=firefox-b-1-e&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_us"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/b-d/messages.json b/browser/components/search/extensions/google/_locales/b-d/messages.json
deleted file mode 100644
index a6423089d9f9..000000000000
--- a/browser/components/search/extensions/google/_locales/b-d/messages.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com/search"
-  },
-  "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}"
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "client=firefox-b-d&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_row"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/b-e/messages.json b/browser/components/search/extensions/google/_locales/b-e/messages.json
deleted file mode 100644
index 70939ee00074..000000000000
--- a/browser/components/search/extensions/google/_locales/b-e/messages.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com/search"
-  },
-  "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-e&q={searchTerms}"
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "client=firefox-b-e&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_row"
-  }
-}
diff --git a/browser/components/search/extensions/google/_locales/en/messages.json b/browser/components/search/extensions/google/_locales/en/messages.json
deleted file mode 100644
index aeca0ef128b3..000000000000
--- a/browser/components/search/extensions/google/_locales/en/messages.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "extensionName": {
-    "message": "Google"
-  },
-  "extensionDescription": {
-    "message": "Google Search"
-  },
-  "searchUrl": {
-    "message": "https://www.google.com/search"
-  },
-  "searchForm": {
-    "message": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}"
-  },
-  "suggestUrl": {
-    "message": "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "client=firefox-b-d&q={searchTerms}"
-  },
-  "channelPref": {
-    "message": "google_channel_row"
-  }
-
-}
diff --git a/browser/components/search/extensions/google/manifest.json b/browser/components/search/extensions/google/manifest.json
index d62049705ae2..965940517ba4 100644
--- a/browser/components/search/extensions/google/manifest.json
+++ b/browser/components/search/extensions/google/manifest.json
@@ -1,6 +1,6 @@
 {
-  "name": "__MSG_extensionName__",
-  "description": "__MSG_extensionDescription__",
+  "name": "Google",
+  "description": "Google Search",
   "manifest_version": 2,
   "version": "1.1",
   "applications": {
@@ -9,7 +9,6 @@
     }
   },
   "hidden": true,
-  "default_locale": "en",
   "icons": {
     "16": "favicon.ico"
   },
@@ -19,18 +18,18 @@
   "chrome_settings_overrides": {
     "search_provider": {
       "keyword": "@google",
-      "name": "__MSG_extensionName__",
-      "search_url": "__MSG_searchUrl__",
-      "search_form": "__MSG_searchForm__",
-      "suggest_url": "__MSG_suggestUrl__",
+      "name": "Google",
+      "search_url": "https://www.google.com/search",
+      "search_form": "https://www.google.com/search?client=firefox-b-d&q={searchTerms}",
+      "suggest_url": "https://www.google.com/complete/search?client=firefox&q={searchTerms}",
       "params": [
         {
           "name": "channel",
           "condition": "pref",
-          "pref": "__MSG_channelPref__"
+          "pref": "google_channel_row"
         }
       ],
-      "search_url_get_params": "__MSG_searchUrlGetParams__"
+      "search_url_get_params": "client=firefox-b-d&q={searchTerms}"
     }
   }
 }
diff --git a/browser/components/search/extensions/startpage/favicon.png b/browser/components/search/extensions/startpage/favicon.png
new file mode 100644
index 000000000000..44b94a986fd2
Binary files /dev/null and b/browser/components/search/extensions/startpage/favicon.png differ
diff --git a/browser/components/search/extensions/startpage/manifest.json b/browser/components/search/extensions/startpage/manifest.json
new file mode 100644
index 000000000000..c9bd9e1848d0
--- /dev/null
+++ b/browser/components/search/extensions/startpage/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Startpage",
+  "description": "Start Page",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "startpage at search.mozilla.org"
+    }
+  },
+  "hidden": true,
+  "icons": {
+    "16": "favicon.png"
+  },
+  "web_accessible_resources": [
+    "favicon.png"
+  ],
+  "chrome_settings_overrides": {
+    "search_provider": {
+      "name": "Startpage",
+      "search_url": "https://startpage.com/rto/search",
+      "search_form": "https://startpage.com/rto/search/",
+      "search_url_post_params": "q={searchTerms}"
+    }
+  }
+}
\ No newline at end of file
diff --git a/browser/components/search/extensions/twitter/favicon.ico b/browser/components/search/extensions/twitter/favicon.ico
new file mode 100644
index 000000000000..e5aaff437912
Binary files /dev/null and b/browser/components/search/extensions/twitter/favicon.ico differ
diff --git a/browser/components/search/extensions/twitter/manifest.json b/browser/components/search/extensions/twitter/manifest.json
new file mode 100644
index 000000000000..59714e0e1045
--- /dev/null
+++ b/browser/components/search/extensions/twitter/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "Twitter",
+  "description": "Realtime Twitter Search",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "twitter at 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
diff --git a/browser/components/search/extensions/wikipedia/_locales/NN/messages.json b/browser/components/search/extensions/wikipedia/_locales/NN/messages.json
deleted file mode 100644
index e4ee66bc780d..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/NN/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (nn)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, det frie oppslagsverket"
-  },
-  "searchUrl": {
-    "message": "https://nn.wikipedia.org/wiki/Spesial:SÃ¸k"
-  },
-  "searchForm": {
-    "message": "https://nn.wikipedia.org/wiki/Spesial:SÃ¸k?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://nn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/NO/messages.json b/browser/components/search/extensions/wikipedia/_locales/NO/messages.json
deleted file mode 100644
index ec016ac7337e..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/NO/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (no)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, den frie encyklopedi"
-  },
-  "searchUrl": {
-    "message": "https://no.wikipedia.org/wiki/Spesial:SÃ¸k"
-  },
-  "searchForm": {
-    "message": "https://no.wikipedia.org/wiki/Spesial:SÃ¸k?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://no.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/af/messages.json b/browser/components/search/extensions/wikipedia/_locales/af/messages.json
deleted file mode 100644
index 8cf9de8ac9b3..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/af/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (af)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, die vrye ensiklopedie"
-  },
-  "searchUrl": {
-    "message": "https://af.wikipedia.org/wiki/Spesiaal:Soek"
-  },
-  "searchForm": {
-    "message": "https://af.wikipedia.org/wiki/Spesiaal:Soek?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://af.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/an/messages.json b/browser/components/search/extensions/wikipedia/_locales/an/messages.json
deleted file mode 100644
index e8cce665c96e..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/an/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Biquipedia (an)"
-  },
-  "extensionDescription": {
-    "message": "A enciclopedia Libre"
-  },
-  "searchUrl": {
-    "message": "https://an.wikipedia.org/wiki/Especial:Mirar"
-  },
-  "searchForm": {
-    "message": "https://an.wikipedia.org/wiki/Especial:Mirar?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://an.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ar/messages.json b/browser/components/search/extensions/wikipedia/_locales/ar/messages.json
deleted file mode 100644
index de90b2a2055e..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ar/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ÙˆÙŠÙƒÙŠØ¨ÙŠØ¯ÙŠØ§ (ar)"
-  },
-  "extensionDescription": {
-    "message": "ÙˆÙŠÙƒÙŠØ¨ÙŠØ¯ÙŠØ§ (ar)"
-  },
-  "searchUrl": {
-    "message": "https://ar.wikipedia.org/wiki/Ø®Ø§Øµ:Ø¨ØØ«"
-  },
-  "searchForm": {
-    "message": "https://ar.wikipedia.org/wiki/Ø®Ø§Øµ:Ø¨ØØ«?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ar.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ast/messages.json b/browser/components/search/extensions/wikipedia/_locales/ast/messages.json
deleted file mode 100644
index a127ba07f29b..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ast/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (ast)"
-  },
-  "extensionDescription": {
-    "message": "La enciclopedia llibre"
-  },
-  "searchUrl": {
-    "message": "https://ast.wikipedia.org/wiki/Especial:Gueta"
-  },
-  "searchForm": {
-    "message": "https://ast.wikipedia.org/wiki/Especial:Gueta?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ast.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/az/messages.json b/browser/components/search/extensions/wikipedia/_locales/az/messages.json
deleted file mode 100644
index f551a717e6d3..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/az/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipediya (az)"
-  },
-  "extensionDescription": {
-    "message": "Vikipediya, aÃ§Ä±q ensiklopediya"
-  },
-  "searchUrl": {
-    "message": "https://az.wikipedia.org/wiki/XÃ¼susi:Axtar"
-  },
-  "searchForm": {
-    "message": "https://az.wikipedia.org/wiki/XÃ¼susi:Axtar?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://az.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/be-tarask/messages.json b/browser/components/search/extensions/wikipedia/_locales/be-tarask/messages.json
deleted file mode 100644
index aecfecf2fb19..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/be-tarask/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Ð’Ñ–ÐºÑ–Ð¿ÑÐ´Ñ‹Ñ (be-tarask)"
-  },
-  "extensionDescription": {
-    "message": "Ð’Ñ–ÐºÑ–Ð¿ÑÐ´Ñ‹Ñ, Ð²Ð¾Ð»ÑŒÐ½Ð°Ñ ÑÐ½Ñ†Ñ‹ÐºÐ»ÑÐ¿ÑÐ´Ñ‹Ñ"
-  },
-  "searchUrl": {
-    "message": "https://be-tarask.wikipedia.org/wiki/Ð¡Ð¿ÑÑ†Ñ‹ÑÐ»ÑŒÐ½Ñ‹Ñ:ÐŸÐ¾ÑˆÑƒÐº"
-  },
-  "searchForm": {
-    "message": "https://be-tarask.wikipedia.org/wiki/Ð¡Ð¿ÑÑ†Ñ‹ÑÐ»ÑŒÐ½Ñ‹Ñ:ÐŸÐ¾ÑˆÑƒÐº?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://be-tarask.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/be/messages.json b/browser/components/search/extensions/wikipedia/_locales/be/messages.json
deleted file mode 100644
index 6aa763451e67..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/be/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Ð’Ñ–ÐºÑ–Ð¿ÐµÐ´Ñ‹Ñ (be)"
-  },
-  "extensionDescription": {
-    "message": "Ð’Ñ–ÐºÑ–Ð¿ÐµÐ´Ñ‹Ñ, ÑÐ²Ð°Ð±Ð¾Ð´Ð½Ð°Ñ ÑÐ½Ñ†Ñ‹ÐºÐ»Ð°Ð¿ÐµÐ´Ñ‹Ñ"
-  },
-  "searchUrl": {
-    "message": "https://be.wikipedia.org/wiki/ÐÐ´Ð¼Ñ‹ÑÐ»Ð¾Ð²Ð°Ðµ:Search"
-  },
-  "searchForm": {
-    "message": "https://be.wikipedia.org/wiki/ÐÐ´Ð¼Ñ‹ÑÐ»Ð¾Ð²Ð°Ðµ:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://be.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/bg/messages.json b/browser/components/search/extensions/wikipedia/_locales/bg/messages.json
deleted file mode 100644
index 896a85d66b87..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/bg/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Ð£Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ (bg)"
-  },
-  "extensionDescription": {
-    "message": "Ð£Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ, ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ‚Ð° ÐµÐ½Ñ†Ð¸ÐºÐ»Ð¾Ð¿Ð¾Ð´Ð¸Ñ"
-  },
-  "searchUrl": {
-    "message": "https://bg.wikipedia.org/wiki/Ð¡Ð¿ÐµÑ†Ð¸Ð°Ð»Ð½Ð¸:Ð¢ÑŠÑ€ÑÐµÐ½Ðµ"
-  },
-  "searchForm": {
-    "message": "https://bg.wikipedia.org/wiki/Ð¡Ð¿ÐµÑ†Ð¸Ð°Ð»Ð½Ð¸:Ð¢ÑŠÑ€ÑÐµÐ½Ðµ?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://bg.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/bn/messages.json b/browser/components/search/extensions/wikipedia/_locales/bn/messages.json
deleted file mode 100644
index fe9887ed1938..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/bn/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "à¦‰à¦‡à¦•à¦¿à¦ªà¦¿à¦¡à¦¿à§Ÿà¦¾ (bn)"
-  },
-  "extensionDescription": {
-    "message": "à¦‰à¦‡à¦•à¦¿à¦ªà¦¿à¦¡à¦¿à§Ÿà¦¾, à¦®à§à¦•à§à¦¤ à¦¬à¦¿à¦¶à§à¦¬à¦•à§‹à¦·"
-  },
-  "searchUrl": {
-    "message": "https://bn.wikipedia.org/wiki/à¦¬à¦¿à¦¶à§‡à¦·:Search"
-  },
-  "searchForm": {
-    "message": "https://bn.wikipedia.org/wiki/à¦¬à¦¿à¦¶à§‡à¦·:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://bn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/br/messages.json b/browser/components/search/extensions/wikipedia/_locales/br/messages.json
deleted file mode 100644
index 33869ce8e752..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/br/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (br)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, an holloueziadur digor"
-  },
-  "searchUrl": {
-    "message": "https://br.wikipedia.org/wiki/Dibar:Klask"
-  },
-  "searchForm": {
-    "message": "https://br.wikipedia.org/wiki/Dibar:Klask?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://br.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/bs/messages.json b/browser/components/search/extensions/wikipedia/_locales/bs/messages.json
deleted file mode 100644
index 746150e3d8e8..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/bs/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (bs)"
-  },
-  "extensionDescription": {
-    "message": "Slobodna enciklopedija"
-  },
-  "searchUrl": {
-    "message": "https://bs.wikipedia.org/wiki/Posebno:Pretraga"
-  },
-  "searchForm": {
-    "message": "https://bs.wikipedia.org/wiki/Posebno:Pretraga?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://bs.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ca/messages.json b/browser/components/search/extensions/wikipedia/_locales/ca/messages.json
deleted file mode 100644
index 151ec1a71ba5..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ca/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ViquipÃ¨dia (ca)"
-  },
-  "extensionDescription": {
-    "message": "L'enciclopÃ¨dia lliure"
-  },
-  "searchUrl": {
-    "message": "https://ca.wikipedia.org/wiki/Especial:Cerca"
-  },
-  "searchForm": {
-    "message": "https://ca.wikipedia.org/wiki/Especial:Cerca?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ca.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/cy/messages.json b/browser/components/search/extensions/wikipedia/_locales/cy/messages.json
deleted file mode 100644
index cfed7c73be34..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/cy/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wicipedia (cy)"
-  },
-  "extensionDescription": {
-    "message": "Wicipedia, Y Gwyddioniadur Rhydd"
-  },
-  "searchUrl": {
-    "message": "https://cy.wikipedia.org/wiki/Arbennig:Search"
-  },
-  "searchForm": {
-    "message": "https://cy.wikipedia.org/wiki/Arbennig:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://cy.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/cz/messages.json b/browser/components/search/extensions/wikipedia/_locales/cz/messages.json
deleted file mode 100644
index 12f7eb22d711..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/cz/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedie (cs)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, svobodnÃ¡ encyclopedie"
-  },
-  "searchUrl": {
-    "message": "https://cs.wikipedia.org/wiki/SpeciÃ¡lnÃ:HledÃ¡nÃ"
-  },
-  "searchForm": {
-    "message": "https://cs.wikipedia.org/wiki/SpeciÃ¡lnÃ:HledÃ¡nÃ?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://cs.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/da/messages.json b/browser/components/search/extensions/wikipedia/_locales/da/messages.json
deleted file mode 100644
index 801d5a5183cc..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/da/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (da)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, den frie encyklopÃ¦di"
-  },
-  "searchUrl": {
-    "message": "https://da.wikipedia.org/wiki/Speciel:SÃ¸gning"
-  },
-  "searchForm": {
-    "message": "https://da.wikipedia.org/wiki/Speciel:SÃ¸gning?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://da.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/de/messages.json b/browser/components/search/extensions/wikipedia/_locales/de/messages.json
deleted file mode 100644
index 0e6bbe8905ca..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/de/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (de)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, die freie EnzyklopÃ¤die"
-  },
-  "searchUrl": {
-    "message": "https://de.wikipedia.org/wiki/Spezial:Suche"
-  },
-  "searchForm": {
-    "message": "https://de.wikipedia.org/wiki/Spezial:Suche?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://de.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/dsb/messages.json b/browser/components/search/extensions/wikipedia/_locales/dsb/messages.json
deleted file mode 100644
index ffca44b5f7fb..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/dsb/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedija (dsb)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedija, lichotna encyklopedija"
-  },
-  "searchUrl": {
-    "message": "https://dsb.wikipedia.org/wiki/Specialne:PytaÅ›"
-  },
-  "searchForm": {
-    "message": "https://dsb.wikipedia.org/wiki/Specialne:PytaÅ›?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://dsb.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/el/messages.json b/browser/components/search/extensions/wikipedia/_locales/el/messages.json
deleted file mode 100644
index 95b48f3d9ca7..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/el/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (el)"
-  },
-  "extensionDescription": {
-    "message": "Î’Î¹ÎºÎ¹Ï€Î±Î¯Î´ÎµÎ¹Î±, Î· ÎµÎ»ÎµÏÎ¸ÎµÏÎ· ÎµÎ³ÎºÏ…ÎºÎ»Î¿Ï€Î±Î¯Î´ÎµÎ¹Î±"
-  },
-  "searchUrl": {
-    "message": "https://el.wikipedia.org/wiki/Î•Î¹Î´Î¹ÎºÏŒ:Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ·"
-  },
-  "searchForm": {
-    "message": "https://el.wikipedia.org/wiki/Î•Î¹Î´Î¹ÎºÏŒ:Î‘Î½Î±Î¶Î®Ï„Î·ÏƒÎ·?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://el.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/en/messages.json b/browser/components/search/extensions/wikipedia/_locales/en/messages.json
deleted file mode 100644
index 0de3c9a8071a..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/en/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (en)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, the Free Encyclopedia"
-  },
-  "searchUrl": {
-    "message": "https://en.wikipedia.org/wiki/Special:Search"
-  },
-  "searchForm": {
-    "message": "https://en.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/eo/messages.json b/browser/components/search/extensions/wikipedia/_locales/eo/messages.json
deleted file mode 100644
index 10aa88dd11ba..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/eo/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipedio (eo)"
-  },
-  "extensionDescription": {
-    "message": "Vikipedio, la libera enciklopedio"
-  },
-  "searchUrl": {
-    "message": "https://eo.wikipedia.org/wiki/SpecialaÄµo:SerÄ‰i"
-  },
-  "searchForm": {
-    "message": "https://eo.wikipedia.org/wiki/SpecialaÄµo:SerÄ‰i?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://eo.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/es/messages.json b/browser/components/search/extensions/wikipedia/_locales/es/messages.json
deleted file mode 100644
index 09ec1f757657..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/es/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (es)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, la enciclopedia libre"
-  },
-  "searchUrl": {
-    "message": "https://es.wikipedia.org/wiki/Especial:Buscar"
-  },
-  "searchForm": {
-    "message": "https://es.wikipedia.org/wiki/Especial:Buscar?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://es.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/et/messages.json b/browser/components/search/extensions/wikipedia/_locales/et/messages.json
deleted file mode 100644
index 91363fbb392b..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/et/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipeedia (et)"
-  },
-  "extensionDescription": {
-    "message": "Vikipeedia, vaba entsÃ¼klopeedia"
-  },
-  "searchUrl": {
-    "message": "https://et.wikipedia.org/wiki/Eri:Otsimine"
-  },
-  "searchForm": {
-    "message": "https://et.wikipedia.org/wiki/Eri:Otsimine?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://et.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/eu/messages.json b/browser/components/search/extensions/wikipedia/_locales/eu/messages.json
deleted file mode 100644
index 1bd7027dec54..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/eu/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (eu)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, entziklopedia askea"
-  },
-  "searchUrl": {
-    "message": "https://eu.wikipedia.org/wiki/Berezi:Bilatu"
-  },
-  "searchForm": {
-    "message": "https://eu.wikipedia.org/wiki/Berezi:Bilatu?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://eu.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/fa/messages.json b/browser/components/search/extensions/wikipedia/_locales/fa/messages.json
deleted file mode 100644
index 9fdc964a1e0b..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/fa/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ÙˆÛŒÚ©ÛŒâ€ŒÙ¾Ø¯ÛŒØ§ (fa)"
-  },
-  "extensionDescription": {
-    "message": "ÙˆÛŒÚ©ÛŒâ€ŒÙ¾Ø¯ÛŒØ§ØŒ Ø¯Ø§Ù†Ø´Ù†Ø§Ù…Ù‡Ù” Ø¢Ø²Ø§Ø¯"
-  },
-  "searchUrl": {
-    "message": "https://fa.wikipedia.org/wiki/ÙˆÛŒÚ˜Ù‡:Ø¬Ø³ØªØ¬Ùˆ"
-  },
-  "searchForm": {
-    "message": "https://fa.wikipedia.org/wiki/ÙˆÛŒÚ˜Ù‡:Ø¬Ø³ØªØ¬Ùˆ?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://fa.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/fi/messages.json b/browser/components/search/extensions/wikipedia/_locales/fi/messages.json
deleted file mode 100644
index 17a9cbe22c42..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/fi/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (fi)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia (fi), vapaa tietosanakirja"
-  },
-  "searchUrl": {
-    "message": "https://fi.wikipedia.org/wiki/Toiminnot:Haku"
-  },
-  "searchForm": {
-    "message": "https://fi.wikipedia.org/wiki/Toiminnot:Haku?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://fi.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/fr/messages.json b/browser/components/search/extensions/wikipedia/_locales/fr/messages.json
deleted file mode 100644
index 33dcbe9dc502..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/fr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "WikipÃ©dia (fr)"
-  },
-  "extensionDescription": {
-    "message": "WikipÃ©dia, l'encyclopÃ©die libre"
-  },
-  "searchUrl": {
-    "message": "https://fr.wikipedia.org/wiki/SpÃ©cial:Recherche"
-  },
-  "searchForm": {
-    "message": "https://fr.wikipedia.org/wiki/SpÃ©cial:Recherche?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://fr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/fy-NL/messages.json b/browser/components/search/extensions/wikipedia/_locales/fy-NL/messages.json
deleted file mode 100644
index f350162fbbaf..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/fy-NL/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedy (fy)"
-  },
-  "extensionDescription": {
-    "message": "De fergese ensyklopedy"
-  },
-  "searchUrl": {
-    "message": "https://fy.wikipedia.org/wiki/Wiki:Sykje"
-  },
-  "searchForm": {
-    "message": "https://fy.wikipedia.org/wiki/Wiki:Sykje?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://fy.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ga-IE/messages.json b/browser/components/search/extensions/wikipedia/_locales/ga-IE/messages.json
deleted file mode 100644
index 994ea723c6da..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ga-IE/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "VicipÃ©id (ga)"
-  },
-  "extensionDescription": {
-    "message": "VicipÃ©id, an ChiclipÃ©id Shaor"
-  },
-  "searchUrl": {
-    "message": "https://ga.wikipedia.org/wiki/Speisialta:Search"
-  },
-  "searchForm": {
-    "message": "https://ga.wikipedia.org/wiki/Speisialta:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ga.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/gd/messages.json b/browser/components/search/extensions/wikipedia/_locales/gd/messages.json
deleted file mode 100644
index f16f16fb4a02..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/gd/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Uicipeid (gd)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, An leabhar mÃ²r-eÃ²lais"
-  },
-  "searchUrl": {
-    "message": "https://gd.wikipedia.org/wiki/SÃ²nraichte:Search"
-  },
-  "searchForm": {
-    "message": "https://gd.wikipedia.org/wiki/SÃ²nraichte:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://gd.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/gl/messages.json b/browser/components/search/extensions/wikipedia/_locales/gl/messages.json
deleted file mode 100644
index 88880bffc3d9..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/gl/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (gl)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, a enciclopedia libre"
-  },
-  "searchUrl": {
-    "message": "https://gl.wikipedia.org/wiki/Especial:Procurar"
-  },
-  "searchForm": {
-    "message": "https://gl.wikipedia.org/wiki/Especial:Procurar?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://gl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/gn/messages.json b/browser/components/search/extensions/wikipedia/_locales/gn/messages.json
deleted file mode 100644
index 5efc5ed74a95..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/gn/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "VikipetÃ£ (gn)"
-  },
-  "extensionDescription": {
-    "message": "VikipetÃ£, opaite tembikuaa hekosÃ£sÃ³va renda"
-  },
-  "searchUrl": {
-    "message": "https://gn.wikipedia.org/wiki/Mba'echÄ©chÄ©:Buscar"
-  },
-  "searchForm": {
-    "message": "https://gn.wikipedia.org/wiki/Mba'echÄ©chÄ©:Buscar?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://gn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/gu/messages.json b/browser/components/search/extensions/wikipedia/_locales/gu/messages.json
deleted file mode 100644
index 3d2f68826fc5..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/gu/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "àªµàª¿àª•àª¿àªªà«€àª¡àª¿àª¯àª¾ (gu)"
-  },
-  "extensionDescription": {
-    "message": "àªµà«€àª•à«€àªªà«€àª¡àª¿àª¯àª¾, àª®à«àª•à«àª¤ àªàª¨àª¸àª¾àª¯àª•à«àª²à«‹àªªà«€àª¡àª¿àª¯àª¾"
-  },
-  "searchUrl": {
-    "message": "https://gu.wikipedia.org/wiki/àªµàª¿àª¶à«‡àª·:àª¶à«‹àª§"
-  },
-  "searchForm": {
-    "message": "https://gu.wikipedia.org/wiki/àªµàª¿àª¶à«‡àª·:àª¶à«‹àª§?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://gu.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/he/messages.json b/browser/components/search/extensions/wikipedia/_locales/he/messages.json
deleted file mode 100644
index 1f8471e980f0..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/he/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "×•×™×§×™×¤×“×™×”"
-  },
-  "extensionDescription": {
-    "message": "×•×™×§×™×¤×“×™×”"
-  },
-  "searchUrl": {
-    "message": "https://he.wikipedia.org/wiki/×ž×™×•×—×“:×—×™×¤×•×©"
-  },
-  "searchForm": {
-    "message": "https://he.wikipedia.org/wiki/×ž×™×•×—×“:×—×™×¤×•×©?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://he.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/hi/messages.json b/browser/components/search/extensions/wikipedia/_locales/hi/messages.json
deleted file mode 100644
index f3b7d14eafa0..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/hi/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "à¤µà¤¿à¤•à¤¿à¤ªà¥€à¤¡à¤¿à¤¯à¤¾ (hi)"
-  },
-  "extensionDescription": {
-    "message": "à¤µà¤¿à¤•à¤¿à¤ªà¥€à¤¡à¤¿à¤¯à¤¾ (à¤¹à¤¿à¤¨à¥à¤¦à¥€)"
-  },
-  "searchUrl": {
-    "message": "https://hi.wikipedia.org/wiki/à¤µà¤¿à¤¶à¥‡à¤·:à¤–à¥‹à¤œ"
-  },
-  "searchForm": {
-    "message": "https://hi.wikipedia.org/wiki/à¤µà¤¿à¤¶à¥‡à¤·:à¤–à¥‹à¤œ?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://hi.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/hr/messages.json b/browser/components/search/extensions/wikipedia/_locales/hr/messages.json
deleted file mode 100644
index 18a6177efcca..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/hr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedija (hr)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedija, slobodna enciklopedija"
-  },
-  "searchUrl": {
-    "message": "https://hr.wikipedia.org/wiki/Posebno:TraÅ¾i"
-  },
-  "searchForm": {
-    "message": "https://hr.wikipedia.org/wiki/Posebno:TraÅ¾i?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://hr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/hsb/messages.json b/browser/components/search/extensions/wikipedia/_locales/hsb/messages.json
deleted file mode 100644
index d4e62836e6e9..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/hsb/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedija (hsb)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedija, swobodna encyklopedija"
-  },
-  "searchUrl": {
-    "message": "https://hsb.wikipedia.org/wiki/Specialnje:PytaÄ‡"
-  },
-  "searchForm": {
-    "message": "https://hsb.wikipedia.org/wiki/Specialnje:PytaÄ‡?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://hsb.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/hu/messages.json b/browser/components/search/extensions/wikipedia/_locales/hu/messages.json
deleted file mode 100644
index 68300c48a6f3..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/hu/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "WikipÃ©dia (hu)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, a szabad enciklopÃ©dia"
-  },
-  "searchUrl": {
-    "message": "https://hu.wikipedia.org/wiki/SpeciÃ¡lis:KeresÃ©s"
-  },
-  "searchForm": {
-    "message": "https://hu.wikipedia.org/wiki/SpeciÃ¡lis:KeresÃ©s?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://hu.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/hy/messages.json b/browser/components/search/extensions/wikipedia/_locales/hy/messages.json
deleted file mode 100644
index 56c2ae2c641b..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/hy/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (hy)"
-  },
-  "extensionDescription": {
-    "message": "ÕŽÕ«Ö„Õ«ÖƒÕ¥Õ¤Õ«Õ¡Õ Õ¡Õ¦Õ¡Õ¿ Õ°Õ¡Õ¶Ö€Õ¡Õ£Õ«Õ¿Õ¡Ö€Õ¡Õ¶"
-  },
-  "searchUrl": {
-    "message": "https://hy.wikipedia.org/wiki/ÕÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¸Õ²:ÕˆÖ€Õ¸Õ¶Õ¥Õ¬"
-  },
-  "searchForm": {
-    "message": "https://hy.wikipedia.org/wiki/ÕÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¸Õ²:ÕˆÖ€Õ¸Õ¶Õ¥Õ¬?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://hy.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ia/messages.json b/browser/components/search/extensions/wikipedia/_locales/ia/messages.json
deleted file mode 100644
index 6d997ae8fc81..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ia/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (ia)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, le encyclopedia libere"
-  },
-  "searchUrl": {
-    "message": "https://ia.wikipedia.org/wiki/Special:Recerca"
-  },
-  "searchForm": {
-    "message": "https://ia.wikipedia.org/wiki/Special:Recerca?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ia.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/id/messages.json b/browser/components/search/extensions/wikipedia/_locales/id/messages.json
deleted file mode 100644
index 1d35e71b956d..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/id/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (id)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, ensiklopedia bebas"
-  },
-  "searchUrl": {
-    "message": "https://id.wikipedia.org/wiki/Istimewa:Pencarian"
-  },
-  "searchForm": {
-    "message": "https://id.wikipedia.org/wiki/Istimewa:Pencarian?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://id.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/is/messages.json b/browser/components/search/extensions/wikipedia/_locales/is/messages.json
deleted file mode 100644
index f722d88187de..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/is/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (is)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, the free encyclopedia"
-  },
-  "searchUrl": {
-    "message": "https://is.wikipedia.org/wiki/KerfissÃÃ°a:Leit"
-  },
-  "searchForm": {
-    "message": "https://is.wikipedia.org/wiki/KerfissÃÃ°a:Leit?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://is.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/it/messages.json b/browser/components/search/extensions/wikipedia/_locales/it/messages.json
deleted file mode 100644
index 2ca645740f87..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/it/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (it)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, l'enciclopedia libera"
-  },
-  "searchUrl": {
-    "message": "https://it.wikipedia.org/wiki/Speciale:Ricerca"
-  },
-  "searchForm": {
-    "message": "https://it.wikipedia.org/wiki/Speciale:Ricerca?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://it.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ja/messages.json b/browser/components/search/extensions/wikipedia/_locales/ja/messages.json
deleted file mode 100644
index 7215e68768f0..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ja/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (ja)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia - ãƒ•ãƒªãƒ¼ç™¾ç§‘äº‹å…¸"
-  },
-  "searchUrl": {
-    "message": "https://ja.wikipedia.org/wiki/ç‰¹åˆ¥:æ¤œç´¢"
-  },
-  "searchForm": {
-    "message": "https://ja.wikipedia.org/wiki/ç‰¹åˆ¥:æ¤œç´¢?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ja.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ka/messages.json b/browser/components/search/extensions/wikipedia/_locales/ka/messages.json
deleted file mode 100644
index c460a093e5e4..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ka/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "áƒ•áƒ˜áƒ™áƒ˜áƒžáƒ”áƒ“áƒ˜áƒ (ka)"
-  },
-  "extensionDescription": {
-    "message": "áƒ•áƒ˜áƒ™áƒ˜áƒžáƒ”áƒ“áƒ˜áƒ, áƒ—áƒáƒ•áƒ˜áƒ¡áƒ£áƒ¤áƒáƒšáƒ˜ áƒ”áƒœáƒªáƒ˜áƒ™áƒšáƒáƒžáƒ”áƒ“áƒ˜áƒ"
-  },
-  "searchUrl": {
-    "message": "https://ka.wikipedia.org/wiki/áƒ¡áƒžáƒ”áƒªáƒ˜áƒáƒšáƒ£áƒ áƒ˜:áƒ«áƒ˜áƒ”áƒ‘áƒ"
-  },
-  "searchForm": {
-    "message": "https://ka.wikipedia.org/wiki/áƒ¡áƒžáƒ”áƒªáƒ˜áƒáƒšáƒ£áƒ áƒ˜:áƒ«áƒ˜áƒ”áƒ‘áƒ?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ka.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/kab/messages.json b/browser/components/search/extensions/wikipedia/_locales/kab/messages.json
deleted file mode 100644
index 3cf743b616fe..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/kab/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (kab)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, tasanayt tilellit"
-  },
-  "searchUrl": {
-    "message": "https://kab.wikipedia.org/wiki/Uslig:Search"
-  },
-  "searchForm": {
-    "message": "https://kab.wikipedia.org/wiki/Uslig:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://kab.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/kk/messages.json b/browser/components/search/extensions/wikipedia/_locales/kk/messages.json
deleted file mode 100644
index 0844cca0d7e1..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/kk/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Ð£Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ (kk)"
-  },
-  "extensionDescription": {
-    "message": "Ð£Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ (kk)"
-  },
-  "searchUrl": {
-    "message": "https://kk.wikipedia.org/wiki/ÐÑ€Ð½Ð°Ð¹Ñ‹:Ð†Ð·Ð´ÐµÑƒ"
-  },
-  "searchForm": {
-    "message": "https://kk.wikipedia.org/wiki/ÐÑ€Ð½Ð°Ð¹Ñ‹:Ð†Ð·Ð´ÐµÑƒ?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://kk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/km/messages.json b/browser/components/search/extensions/wikipedia/_locales/km/messages.json
deleted file mode 100644
index 0f0a0880e188..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/km/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ážœáž¸áž‚áž¸áž—áž¸ážŒáž¶ (km)"
-  },
-  "extensionDescription": {
-    "message": "ážœáž¸áž‚áž¸áž—áž¸ážŒáž¶ ážŸáž–áŸ’ážœâ€‹ážœáž…áž“áž¶â€‹áž’áž·áž”áŸ’áž”áž¶áž™â€‹ážŸáŸážšáž¸"
-  },
-  "searchUrl": {
-    "message": "https://km.wikipedia.org/wiki/áž–áž·ážŸáŸážŸ:ážŸáŸ’ážœáŸ‚áž„ážšáž€"
-  },
-  "searchForm": {
-    "message": "https://km.wikipedia.org/wiki/áž–áž·ážŸáŸážŸ:ážŸáŸ’ážœáŸ‚áž„ážšáž€?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://km.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/kn/messages.json b/browser/components/search/extensions/wikipedia/_locales/kn/messages.json
deleted file mode 100644
index 379ef20085a3..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/kn/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (kn)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, the free encyclopedia"
-  },
-  "searchUrl": {
-    "message": "https://kn.wikipedia.org/wiki/à²µà²¿à²¶à³‡à²·:Search"
-  },
-  "searchForm": {
-    "message": "https://kn.wikipedia.org/wiki/à²µà²¿à²¶à³‡à²·:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://kn.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/kr/messages.json b/browser/components/search/extensions/wikipedia/_locales/kr/messages.json
deleted file mode 100644
index 54296cac62bd..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/kr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ìœ„í‚¤ë°±ê³¼ (ko)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, the free encyclopedia"
-  },
-  "searchUrl": {
-    "message": "https://ko.wikipedia.org/wiki/íŠ¹ìˆ˜ê¸°ëŠ¥:ì°¾ê¸°"
-  },
-  "searchForm": {
-    "message": "https://ko.wikipedia.org/wiki/íŠ¹ìˆ˜ê¸°ëŠ¥:ì°¾ê¸°?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ko.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/lij/messages.json b/browser/components/search/extensions/wikipedia/_locales/lij/messages.json
deleted file mode 100644
index cb90db5e4099..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/lij/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (lij)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, l'enciclopedia libera"
-  },
-  "searchUrl": {
-    "message": "https://lij.wikipedia.org/wiki/SpeÃ§iale:RiÃ§erca"
-  },
-  "searchForm": {
-    "message": "https://lij.wikipedia.org/wiki/SpeÃ§iale:RiÃ§erca?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://lij.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/lo/messages.json b/browser/components/search/extensions/wikipedia/_locales/lo/messages.json
deleted file mode 100644
index 712746ec6316..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/lo/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "àº§àº´àºàº´àºžàºµà»€àº”àº (lo)"
-  },
-  "extensionDescription": {
-    "message": "àº§àº´àºàº´àºžàºµà»€àº”àº, àºªàº²àº¥àº²àº™àº¸àºàº»àº¡à»€àºªàº¥àºµ"
-  },
-  "searchUrl": {
-    "message": "https://lo.wikipedia.org/wiki/àºžàº´à»€àºªàº”:àºŠàºàºàº«àº²"
-  },
-  "searchForm": {
-    "message": "https://lo.wikipedia.org/wiki/àºžàº´à»€àºªàº”:àºŠàºàºàº«àº²?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://lo.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/lt/messages.json b/browser/components/search/extensions/wikipedia/_locales/lt/messages.json
deleted file mode 100644
index c061bcc5224c..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/lt/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (lt)"
-  },
-  "extensionDescription": {
-    "message": "Vikipedija, laisvoji enciklopedija"
-  },
-  "searchUrl": {
-    "message": "https://lt.wikipedia.org/wiki/Specialus:PaieÅ¡ka"
-  },
-  "searchForm": {
-    "message": "https://lt.wikipedia.org/wiki/Specialus:PaieÅ¡ka?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://lt.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ltg/messages.json b/browser/components/search/extensions/wikipedia/_locales/ltg/messages.json
deleted file mode 100644
index 0e02810ef3bf..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ltg/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipedeja (ltg)"
-  },
-  "extensionDescription": {
-    "message": "VikipÄ“dija, breivuo eÅ†ciklopedeja"
-  },
-  "searchUrl": {
-    "message": "https://ltg.wikipedia.org/wiki/SeviÅ¡kuo:Search"
-  },
-  "searchForm": {
-    "message": "https://ltg.wikipedia.org/wiki/SeviÅ¡kuo:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ltg.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/lv/messages.json b/browser/components/search/extensions/wikipedia/_locales/lv/messages.json
deleted file mode 100644
index f73814b8574f..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/lv/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "VikipÄ“dija"
-  },
-  "extensionDescription": {
-    "message": "VikipÄ“dija, brÄ«vÄ enciklopÄ“dija"
-  },
-  "searchUrl": {
-    "message": "https://lv.wikipedia.org/wiki/Special:Search"
-  },
-  "searchForm": {
-    "message": "https://lv.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://lv.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/mk/messages.json b/browser/components/search/extensions/wikipedia/_locales/mk/messages.json
deleted file mode 100644
index de7e06e1ac4a..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/mk/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Ð’Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ˜Ð° (mk)"
-  },
-  "extensionDescription": {
-    "message": "Ð’Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ˜Ð°, ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ‚Ð° ÐµÐ½Ñ†Ð¸ÐºÐ»Ð¾Ð¿ÐµÐ´Ð¸Ñ˜Ð°"
-  },
-  "searchUrl": {
-    "message": "https://mk.wikipedia.org/wiki/Ð¡Ð¿ÐµÑ†Ð¸Ñ˜Ð°Ð»Ð½Ð°:Ð‘Ð°Ñ€Ð°Ñ˜"
-  },
-  "searchForm": {
-    "message": "https://mk.wikipedia.org/wiki/Ð¡Ð¿ÐµÑ†Ð¸Ñ˜Ð°Ð»Ð½Ð°:Ð‘Ð°Ñ€Ð°Ñ˜?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://mk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/mr/messages.json b/browser/components/search/extensions/wikipedia/_locales/mr/messages.json
deleted file mode 100644
index bd46dd83700c..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/mr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "à¤µà¤¿à¤•à¤¿à¤ªà¥€à¤¡à¤¿à¤¯à¤¾ (mr)"
-  },
-  "extensionDescription": {
-    "message": "à¤µà¤¿à¤•à¤¿à¤ªà¥€à¤¡à¤¿à¤¯à¤¾, à¤®à¥‹à¤«à¤¤ à¤®à¤¾à¤¹à¤¿à¤¤à¥€à¤•à¥‹à¤·"
-  },
-  "searchUrl": {
-    "message": "https://mr.wikipedia.org/wiki/à¤µà¤¿à¤¶à¥‡à¤·:à¤¶à¥‹à¤§à¤¾"
-  },
-  "searchForm": {
-    "message": "https://mr.wikipedia.org/wiki/à¤µà¤¿à¤¶à¥‡à¤·:à¤¶à¥‹à¤§à¤¾?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://mr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ms/messages.json b/browser/components/search/extensions/wikipedia/_locales/ms/messages.json
deleted file mode 100644
index c817e82c7821..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ms/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (ms)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, ensiklopedia bebas"
-  },
-  "searchUrl": {
-    "message": "https://ms.wikipedia.org/wiki/Khas:Gelintar"
-  },
-  "searchForm": {
-    "message": "https://ms.wikipedia.org/wiki/Khas:Gelintar?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ms.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/my/messages.json b/browser/components/search/extensions/wikipedia/_locales/my/messages.json
deleted file mode 100644
index 62342d1b90ae..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/my/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (my)"
-  },
-  "extensionDescription": {
-    "message": "á€¡á€á€™á€²á€·á€œá€½á€á€ºá€œá€•á€ºá€…á€½á€šá€ºá€…á€¯á€¶á€€á€»á€™á€ºá€¸"
-  },
-  "searchUrl": {
-    "message": "https://my.wikipedia.org/wiki/Special:Search"
-  },
-  "searchForm": {
-    "message": "https://my.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://my.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ne/messages.json b/browser/components/search/extensions/wikipedia/_locales/ne/messages.json
deleted file mode 100644
index eb22344341e4..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ne/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "à¤µà¤¿à¤•à¤¿à¤ªà¥€à¤¡à¤¿à¤¯à¤¾ (ne)"
-  },
-  "extensionDescription": {
-    "message": "à¤µà¤¿à¤•à¤¿à¤ªà¤¿à¤¡à¤¿à¤¯à¤¾ à¤à¤• à¤¸à¥à¤µà¤¤à¤¨à¥à¤¤à¥à¤° à¤µà¤¿à¤¶à¥à¤µà¤•à¥‹à¤·"
-  },
-  "searchUrl": {
-    "message": "https://ne.wikipedia.org/wiki/à¤µà¤¿à¤¶à¥‡à¤·:Search"
-  },
-  "searchForm": {
-    "message": "https://ne.wikipedia.org/wiki/à¤µà¤¿à¤¶à¥‡à¤·:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ne.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/nl/messages.json b/browser/components/search/extensions/wikipedia/_locales/nl/messages.json
deleted file mode 100644
index c2a810c2ae30..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/nl/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (nl)"
-  },
-  "extensionDescription": {
-    "message": "De vrije encyclopedie"
-  },
-  "searchUrl": {
-    "message": "https://nl.wikipedia.org/wiki/Speciaal:Zoeken"
-  },
-  "searchForm": {
-    "message": "https://nl.wikipedia.org/wiki/Speciaal:Zoeken?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://nl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/oc/messages.json b/browser/components/search/extensions/wikipedia/_locales/oc/messages.json
deleted file mode 100644
index 3cadc3d68f07..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/oc/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "WikipÃ¨dia (oc)"
-  },
-  "extensionDescription": {
-    "message": "WikipÃ¨dia, l'enciclopÃ¨dia liura"
-  },
-  "searchUrl": {
-    "message": "https://oc.wikipedia.org/wiki/Especial:RecÃ¨rca"
-  },
-  "searchForm": {
-    "message": "https://oc.wikipedia.org/wiki/Especial:RecÃ¨rca?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://oc.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/pa/messages.json b/browser/components/search/extensions/wikipedia/_locales/pa/messages.json
deleted file mode 100644
index dff38c2146fd..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/pa/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (pa)"
-  },
-  "extensionDescription": {
-    "message": "à¨µà¨¿à¨•à¨¿à¨ªà©€à¨¡à¨¿à¨†, à¨®à©à¨«à¨¼à¨¤/à¨®à©à¨•à¨¤ à¨¸à¨¼à¨¬à¨¦à¨•à©‹à¨¸à¨¼"
-  },
-  "searchUrl": {
-    "message": "https://pa.wikipedia.org/wiki/à¨–à¨¼à¨¾à¨¸:à¨–à©‹à¨œà©‹"
-  },
-  "searchForm": {
-    "message": "https://pa.wikipedia.org/wiki/à¨–à¨¼à¨¾à¨¸:à¨–à©‹à¨œà©‹?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://pa.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/pl/messages.json b/browser/components/search/extensions/wikipedia/_locales/pl/messages.json
deleted file mode 100644
index 315aa0d9cbe1..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/pl/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (pl)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, wolna encyklopedia"
-  },
-  "searchUrl": {
-    "message": "https://pl.wikipedia.org/wiki/Specjalna:Szukaj"
-  },
-  "searchForm": {
-    "message": "https://pl.wikipedia.org/wiki/Specjalna:Szukaj?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://pl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/pt/messages.json b/browser/components/search/extensions/wikipedia/_locales/pt/messages.json
deleted file mode 100644
index 4beaa97acc88..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/pt/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (pt)"
-  },
-  "extensionDescription": {
-    "message": "WikipÃ©dia, a enciclopÃ©dia livre"
-  },
-  "searchUrl": {
-    "message": "https://pt.wikipedia.org/wiki/Especial:Pesquisar"
-  },
-  "searchForm": {
-    "message": "https://pt.wikipedia.org/wiki/Especial:Pesquisar?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://pt.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/rm/messages.json b/browser/components/search/extensions/wikipedia/_locales/rm/messages.json
deleted file mode 100644
index 8258d5e43451..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/rm/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (rm)"
-  },
-  "extensionDescription": {
-    "message": "Vichipedia, l'enciclopedia libra"
-  },
-  "searchUrl": {
-    "message": "https://rm.wikipedia.org/wiki/Spezial:Search"
-  },
-  "searchForm": {
-    "message": "https://rm.wikipedia.org/wiki/Spezial:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://rm.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ro/messages.json b/browser/components/search/extensions/wikipedia/_locales/ro/messages.json
deleted file mode 100644
index 48865fd547e4..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ro/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (ro)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, enciclopedia liberÄƒ"
-  },
-  "searchUrl": {
-    "message": "https://ro.wikipedia.org/wiki/Special:CÄƒutare"
-  },
-  "searchForm": {
-    "message": "https://ro.wikipedia.org/wiki/Special:CÄƒutare?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ro.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ru/messages.json b/browser/components/search/extensions/wikipedia/_locales/ru/messages.json
deleted file mode 100644
index 569467691d7c..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ru/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Ð’Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ (ru)"
-  },
-  "extensionDescription": {
-    "message": "Ð’Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ, ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð°Ñ ÑÐ½Ñ†Ð¸ÐºÐ»Ð¾Ð¿ÐµÐ´Ð¸Ñ"
-  },
-  "searchUrl": {
-    "message": "https://ru.wikipedia.org/wiki/Ð¡Ð»ÑƒÐ¶ÐµÐ±Ð½Ð°Ñ:ÐŸÐ¾Ð¸ÑÐº"
-  },
-  "searchForm": {
-    "message": "https://ru.wikipedia.org/wiki/Ð¡Ð»ÑƒÐ¶ÐµÐ±Ð½Ð°Ñ:ÐŸÐ¾Ð¸ÑÐº?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ru.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/si/messages.json b/browser/components/search/extensions/wikipedia/_locales/si/messages.json
deleted file mode 100644
index 0406ae728d71..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/si/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (si)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, the free encyclopedia"
-  },
-  "searchUrl": {
-    "message": "https://si.wikipedia.org/wiki/à·€à·’à·à·šà·‚:à¶œà·€à·šà·‚à¶«à¶º"
-  },
-  "searchForm": {
-    "message": "https://si.wikipedia.org/wiki/à·€à·’à·à·šà·‚:à¶œà·€à·šà·‚à¶«à¶º?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://si.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/sk/messages.json b/browser/components/search/extensions/wikipedia/_locales/sk/messages.json
deleted file mode 100644
index 5c2f75f8b031..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/sk/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "WikipÃ©dia (sk)"
-  },
-  "extensionDescription": {
-    "message": "WikipÃ©dia, slobodnÃ¡ a otvorenÃ¡ encyklopÃ©dia"
-  },
-  "searchUrl": {
-    "message": "https://sk.wikipedia.org/wiki/Å peciÃ¡lne:HÄ¾adanie"
-  },
-  "searchForm": {
-    "message": "https://sk.wikipedia.org/wiki/Å peciÃ¡lne:HÄ¾adanie?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://sk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/sl/messages.json b/browser/components/search/extensions/wikipedia/_locales/sl/messages.json
deleted file mode 100644
index 7385a2203474..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/sl/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedija (sl)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedija, prosta enciklopedija"
-  },
-  "searchUrl": {
-    "message": "https://sl.wikipedia.org/wiki/Posebno:Iskanje"
-  },
-  "searchForm": {
-    "message": "https://sl.wikipedia.org/wiki/Posebno:Iskanje?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://sl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/sq/messages.json b/browser/components/search/extensions/wikipedia/_locales/sq/messages.json
deleted file mode 100644
index 68361d8ab294..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/sq/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (sq)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, enciklopedia e lirÃ«"
-  },
-  "searchUrl": {
-    "message": "https://sq.wikipedia.org/wiki/Speciale:KÃ«rkim"
-  },
-  "searchForm": {
-    "message": "https://sq.wikipedia.org/wiki/Speciale:KÃ«rkim?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://sq.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/sr/messages.json b/browser/components/search/extensions/wikipedia/_locales/sr/messages.json
deleted file mode 100644
index 50ebc0a197a1..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/sr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Ð’Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ˜Ð° (sr)"
-  },
-  "extensionDescription": {
-    "message": "ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð³Ð° Ð’Ð¸ÐºÐ¸Ð¿ÐµÐ´Ð¸Ñ˜Ðµ Ð½Ð° ÑÑ€Ð¿ÑÐºÐ¾Ð¼ Ñ˜ÐµÐ·Ð¸ÐºÑƒ"
-  },
-  "searchUrl": {
-    "message": "https://sr.wikipedia.org/wiki/ÐŸÐ¾ÑÐµÐ±Ð½Ð¾:ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð¶Ð¸"
-  },
-  "searchForm": {
-    "message": "https://sr.wikipedia.org/wiki/ÐŸÐ¾ÑÐµÐ±Ð½Ð¾:ÐŸÑ€ÐµÑ‚Ñ€Ð°Ð¶Ð¸?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://sr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/sv-SE/messages.json b/browser/components/search/extensions/wikipedia/_locales/sv-SE/messages.json
deleted file mode 100644
index 1edc3db80d98..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/sv-SE/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (sv)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, den fria encyklopedin"
-  },
-  "searchUrl": {
-    "message": "https://sv.wikipedia.org/wiki/Special:SÃ¶k"
-  },
-  "searchForm": {
-    "message": "https://sv.wikipedia.org/wiki/Special:SÃ¶k?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://sv.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ta/messages.json b/browser/components/search/extensions/wikipedia/_locales/ta/messages.json
deleted file mode 100644
index 54397603b028..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ta/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "à®µà®¿à®•à¯à®•à®¿à®ªà¯à®ªà¯€à®Ÿà®¿à®¯à®¾ (ta)"
-  },
-  "extensionDescription": {
-    "message": "à®µà®¿à®•à¯à®•à®¿à®ªà¯à®ªà¯€à®Ÿà®¿à®¯à®¾ (ta)"
-  },
-  "searchUrl": {
-    "message": "https://ta.wikipedia.org/wiki/à®šà®¿à®±à®ªà¯à®ªà¯:Search"
-  },
-  "searchForm": {
-    "message": "https://ta.wikipedia.org/wiki/à®šà®¿à®±à®ªà¯à®ªà¯:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ta.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/te/messages.json b/browser/components/search/extensions/wikipedia/_locales/te/messages.json
deleted file mode 100644
index c474be12a76f..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/te/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "à°µà°¿à°•à±€à°ªà±€à°¡à°¿à°¯à°¾ (te)"
-  },
-  "extensionDescription": {
-    "message": "à°µà°¿à°•à±€à°ªà±€à°¡à°¿à°¯à°¾ (te)"
-  },
-  "searchUrl": {
-    "message": "https://te.wikipedia.org/wiki/à°ªà±à°°à°¤à±à°¯à±‡à°•:à°…à°¨à±à°µà±‡à°·à°£"
-  },
-  "searchForm": {
-    "message": "https://te.wikipedia.org/wiki/à°ªà±à°°à°¤à±à°¯à±‡à°•:à°…à°¨à±à°µà±‡à°·à°£?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://te.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/th/messages.json b/browser/components/search/extensions/wikipedia/_locales/th/messages.json
deleted file mode 100644
index 3d6aeb07ca2c..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/th/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "à¸§à¸´à¸à¸´à¸žà¸µà¹€à¸”à¸µà¸¢"
-  },
-  "extensionDescription": {
-    "message": "à¸§à¸´à¸à¸´à¸žà¸µà¹€à¸”à¸µà¸¢ à¸ªà¸²à¸£à¸²à¸™à¸¸à¸à¸£à¸¡à¹€à¸ªà¸£à¸µ"
-  },
-  "searchUrl": {
-    "message": "https://th.wikipedia.org/wiki/à¸žà¸´à¹€à¸¨à¸©:à¸„à¹‰à¸™à¸«à¸²"
-  },
-  "searchForm": {
-    "message": "https://th.wikipedia.org/wiki/à¸žà¸´à¹€à¸¨à¸©:à¸„à¹‰à¸™à¸«à¸²?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://th.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/tl/messages.json b/browser/components/search/extensions/wikipedia/_locales/tl/messages.json
deleted file mode 100644
index d55b03131f97..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/tl/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (tl)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, ang malayang ensiklopedya"
-  },
-  "searchUrl": {
-    "message": "https://tl.wikipedia.org/wiki/Natatangi:Maghanap"
-  },
-  "searchForm": {
-    "message": "https://tl.wikipedia.org/wiki/Natatangi:Maghanap?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://tl.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/tr/messages.json b/browser/components/search/extensions/wikipedia/_locales/tr/messages.json
deleted file mode 100644
index 878b28ab68b2..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/tr/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (tr)"
-  },
-  "extensionDescription": {
-    "message": "Vikipedi, Ã¶zgÃ¼r ansiklopedi"
-  },
-  "searchUrl": {
-    "message": "https://tr.wikipedia.org/wiki/Ã–zel:Ara"
-  },
-  "searchForm": {
-    "message": "https://tr.wikipedia.org/wiki/Ã–zel:Ara?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://tr.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/uk/messages.json b/browser/components/search/extensions/wikipedia/_locales/uk/messages.json
deleted file mode 100644
index 2749b86304bf..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/uk/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Ð’Ñ–ÐºÑ–Ð¿ÐµÐ´Ñ–Ñ (uk)"
-  },
-  "extensionDescription": {
-    "message": "Ð’Ñ–ÐºÑ–Ð¿ÐµÐ´Ñ–Ñ, Ð²Ñ–Ð»ÑŒÐ½Ð° ÐµÐ½Ñ†Ð¸ÐºÐ»Ð¾Ð¿ÐµÐ´Ñ–Ñ"
-  },
-  "searchUrl": {
-    "message": "https://uk.wikipedia.org/wiki/Ð¡Ð¿ÐµÑ†Ñ–Ð°Ð»ÑŒÐ½Ð°:ÐŸÐ¾ÑˆÑƒÐº"
-  },
-  "searchForm": {
-    "message": "https://uk.wikipedia.org/wiki/Ð¡Ð¿ÐµÑ†Ñ–Ð°Ð»ÑŒÐ½Ð°:ÐŸÐ¾ÑˆÑƒÐº?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://uk.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/ur/messages.json b/browser/components/search/extensions/wikipedia/_locales/ur/messages.json
deleted file mode 100644
index dcc87e0c853c..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/ur/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ÙˆÛŒÚ©ÛŒÙ¾ÛŒÚˆÛŒØ§ (ur)"
-  },
-  "extensionDescription": {
-    "message": "ÙˆÛŒÚ©ÛŒÙ¾ÛŒÚˆÛŒØ§ Ø¢Ø²Ø§Ø¯ Ø¯Ø§Ø¦Ø±Ûƒ Ø§Ù„Ù…Ø¹Ø§Ø±Ù"
-  },
-  "searchUrl": {
-    "message": "https://ur.wikipedia.org/wiki/Ø®Ø§Øµ:ØªÙ„Ø§Ø´"
-  },
-  "searchForm": {
-    "message": "https://ur.wikipedia.org/wiki/Ø®Ø§Øµ:ØªÙ„Ø§Ø´?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://ur.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/uz/messages.json b/browser/components/search/extensions/wikipedia/_locales/uz/messages.json
deleted file mode 100644
index 89a8f2a89bca..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/uz/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Vikipediya (uz)"
-  },
-  "extensionDescription": {
-    "message": "Vikipediya, ochiq ensiklopediya"
-  },
-  "searchUrl": {
-    "message": "https://uz.wikipedia.org/wiki/Maxsus:Search"
-  },
-  "searchForm": {
-    "message": "https://uz.wikipedia.org/wiki/Maxsus:Search?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://uz.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/vi/messages.json b/browser/components/search/extensions/wikipedia/_locales/vi/messages.json
deleted file mode 100644
index c0844e4feb14..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/vi/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (vi)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, bÃ¡ch khoa toÃ n thÆ° má»Ÿ"
-  },
-  "searchUrl": {
-    "message": "https://vi.wikipedia.org/wiki/Äáº·c_biá»‡t:TÃ¬m_kiáº¿m"
-  },
-  "searchForm": {
-    "message": "https://vi.wikipedia.org/wiki/Äáº·c_biá»‡t:TÃ¬m_kiáº¿m?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://vi.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/wo/messages.json b/browser/components/search/extensions/wikipedia/_locales/wo/messages.json
deleted file mode 100644
index 7efde3b1d0f4..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/wo/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (wo)"
-  },
-  "extensionDescription": {
-    "message": "Wikipedia, Jimbulang bu Ubbeeku bi"
-  },
-  "searchUrl": {
-    "message": "https://wo.wikipedia.org/wiki/Jagleel:Ceet"
-  },
-  "searchForm": {
-    "message": "https://wo.wikipedia.org/wiki/Jagleel:Ceet?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://wo.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/zh-CN/messages.json b/browser/components/search/extensions/wikipedia/_locales/zh-CN/messages.json
deleted file mode 100644
index 29047565a243..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/zh-CN/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "ç»´åŸºç™¾ç§‘"
-  },
-  "extensionDescription": {
-    "message": "ç»´åŸºç™¾ç§‘ï¼Œè‡ªç”±çš„ç™¾ç§‘å…¨ä¹¦"
-  },
-  "searchUrl": {
-    "message": "https://zh.wikipedia.org/wiki/Special:æœç´¢"
-  },
-  "searchForm": {
-    "message": "https://zh.wikipedia.org/wiki/Special:æœç´¢?search={searchTerms}&sourceid=Mozilla-search"
-  },
-  "suggestUrl": {
-    "message": "https://zh.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/_locales/zh-TW/messages.json b/browser/components/search/extensions/wikipedia/_locales/zh-TW/messages.json
deleted file mode 100644
index a0e8d880ea26..000000000000
--- a/browser/components/search/extensions/wikipedia/_locales/zh-TW/messages.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extensionName": {
-    "message": "Wikipedia (zh)"
-  },
-  "extensionDescription": {
-    "message": "ç¶åŸºç™¾ç§‘ï¼Œè‡ªç”±çš„ç™¾ç§‘å…¨æ›¸"
-  },
-  "searchUrl": {
-    "message": "https://zh.wikipedia.org/wiki/Special:æœç´¢"
-  },
-  "searchForm": {
-    "message": "https://zh.wikipedia.org/wiki/Special:æœç´¢?search={searchTerms}&sourceid=Mozilla-search&variant=zh-tw"
-  },
-  "suggestUrl": {
-    "message": "https://zh.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}"
-  },
-  "searchUrlGetParams": {
-    "message": "search={searchTerms}&sourceid=Mozilla-search&variant=zh-tw"
-  }
-}
\ No newline at end of file
diff --git a/browser/components/search/extensions/wikipedia/manifest.json b/browser/components/search/extensions/wikipedia/manifest.json
index cd95d3aa9e1c..0af3b2a1c211 100644
--- a/browser/components/search/extensions/wikipedia/manifest.json
+++ b/browser/components/search/extensions/wikipedia/manifest.json
@@ -1,6 +1,6 @@
 {
-  "name": "__MSG_extensionName__",
-  "description": "__MSG_extensionDescription__",
+  "name": "Wikipedia (en)",
+  "description": "Wikipedia, the Free Encyclopedia",
   "manifest_version": 2,
   "version": "1.1",
   "applications": {
@@ -9,7 +9,6 @@
     }
   },
   "hidden": true,
-  "default_locale": "en",
   "icons": {
     "16": "favicon.ico"
   },
@@ -19,11 +18,11 @@
   "chrome_settings_overrides": {
     "search_provider": {
       "keyword": "@wikipedia",
-      "name": "__MSG_extensionName__",
-      "search_url": "__MSG_searchUrl__",
-      "search_form": "__MSG_searchForm__",
-      "suggest_url": "__MSG_suggestUrl__",
-      "search_url_get_params": "__MSG_searchUrlGetParams__"
+      "name": "Wikipedia (en)",
+      "search_url": "https://en.wikipedia.org/wiki/Special:Search",
+      "search_form": "https://en.wikipedia.org/wiki/Special:Search?search={searchTerms}&sourceid=Mozilla-search",
+      "suggest_url": "https://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}",
+      "search_url_get_params": "search={searchTerms}&sourceid=Mozilla-search"
     }
   }
 }
diff --git a/browser/components/search/extensions/yahoo/favicon.ico b/browser/components/search/extensions/yahoo/favicon.ico
new file mode 100644
index 000000000000..9bd1d9f7c008
Binary files /dev/null and b/browser/components/search/extensions/yahoo/favicon.ico differ
diff --git a/browser/components/search/extensions/yahoo/manifest.json b/browser/components/search/extensions/yahoo/manifest.json
new file mode 100644
index 000000000000..e1f04a373c2e
--- /dev/null
+++ b/browser/components/search/extensions/yahoo/manifest.json
@@ -0,0 +1,28 @@
+{
+  "name": "Yahoo",
+  "description": "Yahoo Search",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "yahoo at 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}"
+    }
+  }
+}
diff --git a/browser/components/search/extensions/youtube/favicon.ico b/browser/components/search/extensions/youtube/favicon.ico
new file mode 100644
index 000000000000..977887dbbb84
Binary files /dev/null and b/browser/components/search/extensions/youtube/favicon.ico differ
diff --git a/browser/components/search/extensions/youtube/manifest.json b/browser/components/search/extensions/youtube/manifest.json
new file mode 100644
index 000000000000..6fbf8745bac2
--- /dev/null
+++ b/browser/components/search/extensions/youtube/manifest.json
@@ -0,0 +1,26 @@
+{
+  "name": "YouTube",
+  "description": "YouTube - Videos",
+  "manifest_version": 2,
+  "version": "1.0",
+  "applications": {
+    "gecko": {
+      "id": "youtube at 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
diff --git a/tbb-tests/browser_tor_omnibox.js b/tbb-tests/browser_tor_omnibox.js
new file mode 100644
index 000000000000..e18b2a84a3d8
--- /dev/null
+++ b/tbb-tests/browser_tor_omnibox.js
@@ -0,0 +1,14 @@
+// # Test Tor Omnibox
+// Check what search engines are installed in the search box.
+
+function test() {
+  // Grab engine IDs.
+  let browserSearchService = Components.classes["@mozilla.org/browser/search-service;1"]
+                             .getService(Components.interfaces.nsIBrowserSearchService),
+      engineIDs = browserSearchService.getEngines().map(e => e.identifier);
+
+  // Check that we have the correct engines installed, in the right order.
+  is(engineIDs[0], "ddg", "Default search engine is duckduckgo");
+  is(engineIDs[1], "youtube", "Secondary search engine is youtube");
+  is(engineIDs[2], "google", "Google is third search engine");
+}
diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm
index aa19bad92b62..a2f00eb532fb 100644
--- a/toolkit/components/search/SearchService.jsm
+++ b/toolkit/components/search/SearchService.jsm
@@ -20,7 +20,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   Region: "resource://gre/modules/Region.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   SearchEngine: "resource://gre/modules/SearchEngine.jsm",
-  SearchEngineSelector: "resource://gre/modules/SearchEngineSelector.jsm",
   SearchSettings: "resource://gre/modules/SearchSettings.jsm",
   SearchStaticData: "resource://gre/modules/SearchStaticData.jsm",
   SearchUtils: "resource://gre/modules/SearchUtils.jsm",
@@ -249,11 +248,6 @@ SearchService.prototype = {
     Services.obs.addObserver(this, Region.REGION_TOPIC);
 
     try {
-      // Create the search engine selector.
-      this._engineSelector = new SearchEngineSelector(
-        this._handleConfigurationUpdated.bind(this)
-      );
-
       // See if we have a settings file so we don't have to parse a bunch of XML.
       let settings = await this._settings.get();
 
@@ -1067,16 +1061,16 @@ SearchService.prototype = {
       ? "esr"
       : AppConstants.MOZ_UPDATE_CHANNEL;
 
-    let {
-      engines,
-      privateDefault,
-    } = await this._engineSelector.fetchEngineConfiguration({
-      locale,
-      region,
-      channel,
-      experiment: gExperiment,
-      distroID: SearchUtils.distroID,
-    });
+    const engines = [
+      { webExtension: { id: "ddg at search.mozilla.org" } },
+      { webExtension: { id: "ddg-onion at search.mozilla.org" } },
+      { webExtension: { id: "google at search.mozilla.org" } },
+      { webExtension: { id: "yahoo at search.mozilla.org" } },
+      { webExtension: { id: "twitter at search.mozilla.org" } },
+      { webExtension: { id: "wikipedia at search.mozilla.org" } },
+      { webExtension: { id: "youtube at search.mozilla.org" } },
+      { webExtension: { id: "startpage at search.mozilla.org" } },
+    ];
 
     for (let e of engines) {
       if (!e.webExtension) {
@@ -1085,7 +1079,7 @@ SearchService.prototype = {
       e.webExtension.locale = e.webExtension?.locale ?? SearchUtils.DEFAULT_TAG;
     }
 
-    return { engines, privateDefault };
+    return { engines, privateDefault: undefined };
   },
 
   _setDefaultAndOrdersFromSelector(engines, privateDefault) {



