Issue 3036 - Back out changes from #3003

mobile/android/app/mobile.js

Index: mobile/android/app/mobile.js
diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js
index e0725272b48296ba27c7dd65a4c2b9b5047a8a90..a8b214923ca9d7b72456ed3d602d9aa9fb43ca58 100644
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -255,8 +255,7 @@ pref("accessibility.browsewithcaret_shortcut.enabled", false);
 pref("browser.menu.showCharacterEncoding", "chrome://browser/locale/browser.properties");
 
 // pointer to the default engine name
-// Changed in Adblock Browser, see: https://issues.adblockplus.org/ticket/3003.
-pref("browser.search.defaultenginename", "data:text/plain,browser.search.defaultenginename=DuckDuckGo");
+pref("browser.search.defaultenginename", "chrome://browser/locale/region.properties");
 // maximum number of search suggestions, as a string because the search service expects a string pref
 pref("browser.search.param.maxSuggestions", "4");
 // SSL error page behaviour
@@ -264,10 +263,9 @@ pref("browser.ssl_override_behavior", 2);
 pref("browser.xul.error_pages.expert_bad_cert", false);
 
 // ordering of search engines in the engine list.
-// Changed in Adblock Browser, see: https://issues.adblockplus.org/ticket/3003.
-pref("browser.search.order.1", "data:text/plain,browser.search.order.1=DuckDuckGo");
-pref("browser.search.order.2", "data:text/plain,browser.search.order.2=Google");
-pref("browser.search.order.3", "data:text/plain,browser.search.order.3=Yahoo");
+pref("browser.search.order.1", "chrome://browser/locale/region.properties");
+pref("browser.search.order.2", "chrome://browser/locale/region.properties");
+pref("browser.search.order.3", "chrome://browser/locale/region.properties");
 
 // Market-specific search defaults
 // Changed in Adblock Browser, see: https://issues.adblockplus.org/ticket/3003.
@@ -275,11 +273,10 @@ pref("browser.search.geoSpecificDefaults", false);
 pref("browser.search.geoSpecificDefaults.url", "https://search.services.mozilla.com/1/%APP%/%VERSION%/%CHANNEL%/%LOCALE%/%REGION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%");
 
 // US specific default (used as a fallback if the geoSpecificDefaults request fails).
-// Changed in Adblock Browser, see: https://issues.adblockplus.org/ticket/3003.
-pref("browser.search.defaultenginename.US", "data:text/plain,browser.search.defaultenginename.US=DuckDuckGo");
-pref("browser.search.order.US.1", "data:text/plain,browser.search.order.US.1=DuckDuckGo");
-pref("browser.search.order.US.2", "data:text/plain,browser.search.order.US.2=Google");
-pref("browser.search.order.US.3", "data:text/plain,browser.search.order.US.3=Yahoo");
+pref("browser.search.defaultenginename.US", "chrome://browser/locale/region.properties");
+pref("browser.search.order.US.1", "chrome://browser/locale/region.properties");
+pref("browser.search.order.US.2", "chrome://browser/locale/region.properties");
+pref("browser.search.order.US.3", "chrome://browser/locale/region.properties");
 
 // disable updating
 pref("browser.search.update", false);