Bug 1191520: Hide the search settings footer in non-nightly builds. r=adw

--HG--
extra : commitid : IP9xkJw9xA4
extra : rebase_source : 25a862e918129d17d43fa79e8a5deec2474fb943

browser/base/content/browser.xul

@@ -147,10 +147,12 @@
 
     <!-- for url bar autocomplete -->
     <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true">
+#ifdef NIGHTLY_BUILD
       <hbox id="urlbar-search-footer" flex="1" align="stretch" pack="end">
         <button id="urlbar-search-settings" label="&changeSearchSettings.button;"
                 oncommand="BrowserUITelemetry.countSearchSettingsEvent('urlbar'); openPreferences('paneSearch')"/>
       </hbox>
+#endif
     </panel>
 
     <!-- for select dropdowns. The menupopup is what shows the list of options,

browser/base/content/test/general/browser_urlbar_searchsettings.js

@@ -4,6 +4,12 @@
 "use strict";
 
 add_task(function*() {
+  let button = document.getElementById("urlbar-search-settings");
+  if (!button) {
+    ok("Skipping test");
+    return;
+  }
+
   yield BrowserTestUtils.withNewTab({ gBrowser, url: "about:blank" }, function* () {
     let popupopened = BrowserTestUtils.waitForEvent(gURLBar.popup, "popupshown");
 
@@ -14,7 +20,7 @@ add_task(function*() {
     // Since the current tab is blank the preferences pane will load there
     let loaded = BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
     let popupclosed = BrowserTestUtils.waitForEvent(gURLBar.popup, "popuphidden");
-    EventUtils.synthesizeMouseAtCenter(document.getElementById("urlbar-search-settings"), {});
+    EventUtils.synthesizeMouseAtCenter(button, {});
     yield loaded;
     yield popupclosed;
 

browser/base/moz.build

@@ -27,6 +27,8 @@ BROWSER_CHROME_MANIFESTS += [
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
 
+DEFINES['NIGHTLY_BUILD'] = CONFIG['NIGHTLY_BUILD']
+
 DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):