From: Mike Hommey <mh@glandium.org>
Date: Sat, 1 Apr 2017 21:33:19 +0000 (+0900)
Subject: Use the Mozilla Location Service key when the Google Key is not there
X-Git-Tag: archive/raspbian/128.11.0esr-1+rpi1~2^2^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=475b990fcd630192ed0a4832657f5dbbe295acd3;p=firefox-esr.git

Use the Mozilla Location Service key when the Google Key is not there


Gbp-Pq: Topic debian-hacks
Gbp-Pq: Name Use-the-Mozilla-Location-Service-key-when-the-Google.patch
---

diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
index c3e335e722b..46d4f959b40 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -3227,7 +3227,12 @@ pref("network.psl.onUpdate_notify", false);
 
 // All the Geolocation preferences are here.
 //
-pref("geo.provider.network.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%");
+#if defined(GOOGLE_LOCATION_SERVICE_API_KEY)
+  pref("geo.provider.network.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%");
+#else
+  // Use MLS on Nightly and early Beta.
+  pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+#endif
 
 // Timeout to wait before sending the location request.
 pref("geo.provider.network.timeToWaitBeforeSending", 5000);