From 5b295714815c9c8e3b59f66ffb064bfad8e1494d Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Wed, 5 Aug 2015 15:11:15 -0700
Subject: [PATCH] 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                          | 2 ++
 .../content/test/general/browser_urlbar_searchsettings.js | 8 +++++++-
 browser/base/moz.build                                    | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 96acdcf6511f..a7474c0b89bd 100644
--- a/browser/base/content/browser.xul
+++ b/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,
diff --git a/browser/base/content/test/general/browser_urlbar_searchsettings.js b/browser/base/content/test/general/browser_urlbar_searchsettings.js
index 4dd5f8545655..04b1c508b971 100644
--- a/browser/base/content/test/general/browser_urlbar_searchsettings.js
+++ b/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;
 
diff --git a/browser/base/moz.build b/browser/base/moz.build
index 30c7883e2dfd..06b4a21f1614 100644
--- a/browser/base/moz.build
+++ b/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'):