Issue 3036 - Back out changes from #3003

mobile/android/app/mobile.js

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #filter substitution
 
 // For browser.xml binding
 //
 // cacheRatio* is a ratio that determines the amount of pixels to cache. The
 // ratio is multiplied by the viewport width or height to get the displayport's
@@ skipping 237 matching lines @@
 pref("accessibility.typeaheadfind.flashBar", 1);
 pref("accessibility.typeaheadfind.linksonly", false);
 pref("accessibility.typeaheadfind.casesensitive", 0);
 pref("accessibility.browsewithcaret_shortcut.enabled", false);
 
 // Whether the character encoding menu is under the main Firefox button. This
 // preference is a string so that localizers can alter it.
 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
 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.
 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);
 
 // disable search suggestions by default
 pref("browser.search.suggest.enabled", false);
 pref("browser.search.suggest.prompted", false);
 
 // Tell the search service to load search plugins from the locale JAR
 pref("browser.search.loadFromJars", true);
@@ skipping 614 matching lines @@
 #ifdef NIGHTLY_BUILD
 pref("dom.serviceWorkers.enabled", true);
 #endif
 
 // Disable sending console to logcat on release builds.
 #ifdef RELEASE_BUILD
 pref("consoleservice.logcat", false);
 #else
 pref("consoleservice.logcat", true);
 #endif