diff -r 000000000000 -r 6474c204b198 toolkit/components/satchel/nsInputListAutoComplete.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/satchel/nsInputListAutoComplete.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,90 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const Ci = Components.interfaces;
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/Services.jsm");
+Components.utils.import("resource://gre/modules/nsFormAutoCompleteResult.jsm");
+
+function InputListAutoComplete() {}
+
+InputListAutoComplete.prototype = {
+  classID       : Components.ID("{bf1e01d0-953e-11df-981c-0800200c9a66}"),
+  QueryInterface: XPCOMUtils.generateQI([Ci.nsIInputListAutoComplete]),
+
+  autoCompleteSearch : function (formHistoryResult, aUntrimmedSearchString, aField) {
+    let comments = []; // "comments" column values for suggestions
+    let [values, labels] = this.getListSuggestions(aField);
+    let historyResults = [];
+    let historyComments = [];
+
+    // formHistoryResult will be null if form autocomplete is disabled.
+    // We still want the list values to display.
+    if (formHistoryResult) {
+      entries = formHistoryResult.wrappedJSObject.entries;
+      for (let i = 0; i < entries.length; ++i) {
+        historyResults.push(entries[i].text);
+        historyComments.push("");
+      }
+    }
+
+    // fill out the comment column for the suggestions
+    // if we have any suggestions, put a label at the top
+    if (values.length) {
+      comments[0] = "separator";
+    }
+    for (let i = 1; i < values.length; ++i) {
+      comments.push("");
+    }
+
+    // now put the history results above the suggestions
+    let finalValues = historyResults.concat(values);
+    let finalLabels = historyResults.concat(labels);
+    let finalComments = historyComments.concat(comments);
+
+    return new FormAutoCompleteResult(aUntrimmedSearchString,
+                                      Ci.nsIAutoCompleteResult.RESULT_SUCCESS,
+                                      0, "", finalValues, finalLabels,
+                                      finalComments, formHistoryResult);
+  },
+
+  getListSuggestions : function (aField) {
+    let values = [];
+    let labels = [];
+
+    if (aField) {
+      let filter = !aField.hasAttribute("mozNoFilter");
+      let lowerFieldValue = aField.value.toLowerCase();
+
+      if (aField.list) {
+        let options = aField.list.options;
+        let length = options.length;
+        for (let i = 0; i < length; i++) {
+          let item = options.item(i);
+          let label = "";
+          if (item.label) {
+            label = item.label;
+          } else if (item.text) {
+            label = item.text;
+          } else {
+            label = item.value;
+          }
+
+          if (filter && label.toLowerCase().indexOf(lowerFieldValue) == -1) {
+            continue;
+          }
+
+          labels.push(label);
+          values.push(item.value);
+        }
+      }
+    }
+
+    return [values, labels];
+  }
+};
+
+let component = [InputListAutoComplete];
+this.NSGetFactory = XPCOMUtils.generateNSGetFactory(component);