From 1b4b660dd855875463f22cbbe132241fb606c0ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= Date: Wed, 15 Jul 2015 21:17:35 +0200 Subject: [PATCH] Bug 1184045 - Enable region specific search defaults, r=markh. --- browser/app/profile/firefox.js | 2 +- layout/tools/reftest/reftest-preferences.js | 2 ++ mobile/android/app/mobile.js | 2 +- testing/talos/talos.json | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index ea68aa2a40f7..39600ed72af9 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -407,7 +407,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", ""); +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). pref("browser.search.defaultenginename.US", "data:text/plain,browser.search.defaultenginename.US=Yahoo"); diff --git a/layout/tools/reftest/reftest-preferences.js b/layout/tools/reftest/reftest-preferences.js index c1a429e629b2..445708651154 100644 --- a/layout/tools/reftest/reftest-preferences.js +++ b/layout/tools/reftest/reftest-preferences.js @@ -59,6 +59,8 @@ // desired side-effect of preventing our geoip lookup. branch.setBoolPref("browser.search.isUS", true); branch.setCharPref("browser.search.countryCode", "US"); + // Prevent the geoSpecificDefaults XHR by emptying the URL. + branch.setCharPref("browser.search.geoSpecificDefaults.url", ""); // Make sure SelfSupport doesn't hit the network. branch.setCharPref("browser.selfsupport.url", "https://%(server)s/selfsupport-dummy/"); diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index ac204862e1c7..334ff8b62d06 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", ""); +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). pref("browser.search.defaultenginename.US", "chrome://browser/locale/region.properties"); diff --git a/testing/talos/talos.json b/testing/talos/talos.json index d9a50f763a13..526b0e460655 100644 --- a/testing/talos/talos.json +++ b/testing/talos/talos.json @@ -5,7 +5,7 @@ }, "global": { "talos_repo": "https://hg.mozilla.org/build/talos", - "talos_revision": "67dbdddb880f" + "talos_revision": "8a61f8d21fc0" }, "extra_options": { "android": [ "--apkPath=%(apk_path)s" ]