From 330f9e46122869103787de8a086a7a723b070336 Mon Sep 17 00:00:00 2001
From: Garvan Keeley <garvankeeley@gmail.com>
Date: Tue, 20 Oct 2015 14:29:59 -0400
Subject: [PATCH] Bug 1216662: Switch back to MLS, the switch to GLS is on
 hold. r=hannosch

---
 browser/app/profile/firefox.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 229a87ba75ca..c2443ab0932e 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1446,11 +1446,19 @@ pref("plain_text.wrap_long_lines", true);
 pref("dom.debug.propagate_gesture_events_through_content", false);
 
 // The request URL of the GeoLocation backend.
+#ifdef RELEASE_BUILD
+pref("geo.wifi.uri", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_API_KEY%");
+#else
 pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+#endif
 
 #ifdef XP_MACOSX
+#ifdef RELEASE_BUILD
+pref("geo.provider.use_corelocation", false);
+#else
 pref("geo.provider.use_corelocation", true);
 #endif
+#endif
 
 #ifdef XP_WIN
 pref("geo.provider.ms-windows-location", false);