Backed out changeset 050bbef811d4 (bug 1599070) for causing test_textbox_search.xhtml to perma fail CLOSED TREE

browser/components/places/content/places.js

@@ -377,11 +377,7 @@ var PlacesOrganizer = {
     // At this point, resetSearchBox is true, because the left pane selection
     // has changed; otherwise we would have returned earlier.
 
-    let input = PlacesSearchBox.searchFilter;
-    input.value = "";
-    try {
-      input.editor.transactionManager.clear();
-    } catch (e) {}
+    PlacesSearchBox.searchFilter.reset();
     this._setSearchScopeForNode(node);
     this.updateDetailsPane();
   },

browser/modules/Sanitizer.jsm

@@ -411,14 +411,13 @@ var Sanitizer = {
           )) {
             let currentDocument = currentWindow.document;
 
-            // searchBar may not exist if it's in the customize mode.
+            // searchBar.textbox may not exist due to the search bar binding
+            // not having been constructed yet if the search bar is in the
+            // overflow or menu panel. It won't have a value or edit history in
+            // that case.
             let searchBar = currentDocument.getElementById("searchbar");
-            if (searchBar) {
-              let input = searchBar.textbox;
-              input.value = "";
-              try {
-                input.editor.transactionManager.clear();
-              } catch (e) {}
+            if (searchBar && searchBar.textbox) {
+              searchBar.textbox.reset();
             }
 
             let tabBrowser = currentWindow.gBrowser;

toolkit/content/widgets/search-textbox.js

@@ -201,6 +201,16 @@
       return this.inputField.disabled;
     }
 
+    reset() {
+      this.value = this.defaultValue;
+      // XXX: Is this still needed ?
+      try {
+        this.editor.transactionManager.clear();
+        return true;
+      } catch (e) {}
+      return false;
+    }
+
     _fireCommand(me) {
       if (me._timer) {
         clearTimeout(me._timer);