Bug 1110420: need to not do geo-specific defaults for distribution builds. r=markh

toolkit/components/search/nsSearchService.js

@@ -411,7 +411,12 @@ function getIsUS() {
     geoSpecificDefaults = Services.prefs.getBoolPref("browser.search.geoSpecificDefaults");
   } catch(e) {}
 
-  if (!geoSpecificDefaults) {
+  let distroID;
+  try {
+    distroID = Services.prefs.getCharPref("distribution.id");
+  } catch (e) {}
+
+  if (!geoSpecificDefaults || distroID) {
     return false;
   }