Backed out changeset 1d5b01d01df6 (bug 1238286) for m(oth) failures in test_focus_autocomplete.xul

MozReview-Commit-ID: HVzqjvciYqB

browser/base/content/browser.js

@@ -3395,6 +3395,9 @@ const DOMLinkHandler = {
 
 const BrowserSearch = {
   addEngine: function(browser, engine, uri) {
+    if (!this.searchBar)
+      return;
+
     // Check to see whether we've already added an engine with this title
     if (browser.engines) {
       if (browser.engines.some(e => e.title == engine.title))
@@ -3432,7 +3435,11 @@ const BrowserSearch = {
    */
   updateOpenSearchBadge: function() {
     var searchBar = this.searchBar;
-    if (!searchBar)
+
+    // The search bar binding might not be applied even though the element is
+    // in the document (e.g. when the navigation toolbar is hidden), so check
+    // for .textbox specifically.
+    if (!searchBar || !searchBar.textbox)
       return;
 
     var engines = gBrowser.selectedBrowser.engines;

browser/components/search/content/search.xml

@@ -81,7 +81,6 @@
           if (Components.isSuccessCode(aStatus)) {
             // Refresh the display (updating icon, etc)
             this.updateDisplay();
-            BrowserSearch.updateOpenSearchBadge();
           } else {
             Components.utils.reportError("Cannot initialize search service, bailing out: " + aStatus);
           }