Back out changeset: 93f1fda728f7 (Bug 1115575) no longer needed now that Bug 1117158 is fixed rs=IanN a=me CLOSED TREE
authorPhilip Chee <philip.chee@gmail.com>
Sat, 10 Jan 2015 22:27:35 +0800
changeset 21623 756da409acdbb96e3bd90bc3764d0a910f1aa6cc
parent 21622 4b97fba5d943e55c0d6f92e256c88615df194d73
child 21624 f5d850dad82754e1afdca2b3b33cc4192352ae74
push id1305
push usermbanner@mozilla.com
push dateMon, 23 Feb 2015 19:48:12 +0000
treeherdercomm-beta@3ae4f13858fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersIanN, me
bugs1115575, 1117158
Back out changeset: 93f1fda728f7 (Bug 1115575) no longer needed now that Bug 1117158 is fixed rs=IanN a=me CLOSED TREE * Bug 1115575 - Error: formatURLPref: Couldn't get pref: browser.search.geoip.url * Bug 1117158 - Move browser.search.geoip.url pref to all.js
suite/browser/browser-prefs.js
--- a/suite/browser/browser-prefs.js
+++ b/suite/browser/browser-prefs.js
@@ -121,24 +121,16 @@ pref("browser.search.update", true);
 pref("browser.search.update.log", false);
 
 // Check whether we need to perform engine updates every 6 hours
 pref("browser.search.update.interval", 21600);
 
 // enable search suggestions by default
 pref("browser.search.suggest.enabled", true);
 
-// geoip end-point and timeout
-// SeaMonkey note: we are using a dummy key "no-mozilla-api-key" as this
-// Mozilla service currently doesn't use an API key.
-pref("browser.search.geoip.url", "https://location.services.mozilla.com/v1/country?key=no-mozilla-api-key");
-// NOTE: this timeout figure is also the "high" value for the telemetry probe
-// SEARCH_SERVICE_COUNTRY_FETCH_MS - if you change this also change that probe.
-pref("browser.search.geoip.timeout", 2000);
-
 // Smart Browsing prefs
 pref("keyword.enabled", true);
 // Override the default keyword.URL. Empty value means
 // "use the search service's default engine"
 pref("keyword.URL", "");
 
 pref("browser.urlbar.autocomplete.enabled", true);
 pref("browser.urlbar.formatting.enabled", true);