From dce3ea622992fc5b2fcaffcd3780f0949be4a5b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= Date: Fri, 10 Jul 2015 23:58:40 +0200 Subject: [PATCH] Bug 1175218 - disable region defaults by making the geoSpecificDefaults.url pref empty to fix test bustage, a=KWierso on CLOSED TREE --- browser/app/profile/firefox.js | 2 +- mobile/android/app/mobile.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 742716589720..4539add20085 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -408,7 +408,7 @@ pref("browser.search.order.3", "chrome://browser-region/locale/re // This is disabled globally, and then enabled for individual locales // in firefox-l10n.js (eg. it's enabled for en-US). pref("browser.search.geoSpecificDefaults", false); -pref("browser.search.geoSpecificDefaults.url", "https://search.services.mozilla.com/1/%APP%/%VERSION%/%CHANNEL%/%LOCALE%/%REGION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%"); +pref("browser.search.geoSpecificDefaults.url", ""); // US specific default (used as a fallback if the geoSpecificDefaults request fails). pref("browser.search.defaultenginename.US", "data:text/plain,browser.search.defaultenginename.US=Yahoo"); diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index 32501e35402f..8f0e96709e94 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -269,7 +269,7 @@ pref("browser.search.order.3", "chrome://browser/locale/region.properties"); // This is disabled globally, and then enabled for individual locales // in firefox-l10n.js (eg. it's enabled for en-US). pref("browser.search.geoSpecificDefaults", false); -pref("browser.search.geoSpecificDefaults.url", "https://search.services.mozilla.com/1/%APP%/%VERSION%/%CHANNEL%/%LOCALE%/%REGION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%"); +pref("browser.search.geoSpecificDefaults.url", ""); // US specific default (used as a fallback if the geoSpecificDefaults request fails). pref("browser.search.defaultenginename.US", "chrome://browser/locale/region.properties");