From a3a34dad182a65500beddac7470c843ce4daebd6 Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Sat, 20 Apr 2019 07:35:31 -0400
Subject: Remove browser.search.region usage. Tag #245.

---
 toolkit/components/search/current/nsSearchService.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'toolkit/components/search/current')

diff --git a/toolkit/components/search/current/nsSearchService.js b/toolkit/components/search/current/nsSearchService.js
index fd8c9140e..2ea9384f5 100644
--- a/toolkit/components/search/current/nsSearchService.js
+++ b/toolkit/components/search/current/nsSearchService.js
@@ -3236,14 +3236,7 @@ SearchService.prototype = {
 
     // Fallback to building a list based on the regions in the JSON
     if (!engineNames || !engineNames.length) {
-      let region;
-      if (Services.prefs.prefHasUserValue("browser.search.region")) {
-        region = Services.prefs.getCharPref("browser.search.region");
-      }
-      if (!region || !(region in searchSettings)) {
-        region = "default";
-      }
-      engineNames = searchSettings[region]["visibleDefaultEngines"];
+      engineNames = searchSettings["default"]["visibleDefaultEngines"];
     }
 
     for (let name of engineNames) {
-- 
cgit v1.2.3