Issue #439 - Remove tests from toolkit/

43 files changed, 0 insertions, 5375 deletions

diff --git a/toolkit/components/satchel/test/.eslintrc.js b/toolkit/components/satchel/test/.eslintrc.js
deleted file mode 100644
index 3c788d6d6..000000000
--- a/toolkit/components/satchel/test/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "../../../../testing/mochitest/mochitest.eslintrc.js"
-  ]
-};
diff --git a/toolkit/components/satchel/test/browser/.eslintrc.js b/toolkit/components/satchel/test/browser/.eslintrc.js
deleted file mode 100644
index 7c8021192..000000000
--- a/toolkit/components/satchel/test/browser/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "../../../../../testing/mochitest/browser.eslintrc.js"
-  ]
-};
diff --git a/toolkit/components/satchel/test/browser/browser.ini b/toolkit/components/satchel/test/browser/browser.ini
deleted file mode 100644
index 6a3fc452e..000000000
--- a/toolkit/components/satchel/test/browser/browser.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-support-files =
-  !/toolkit/components/satchel/test/subtst_privbrowsing.html
-
-[browser_privbrowsing_perwindowpb.js]
diff --git a/toolkit/components/satchel/test/browser/browser_privbrowsing_perwindowpb.js b/toolkit/components/satchel/test/browser/browser_privbrowsing_perwindowpb.js
deleted file mode 100644
index 982480648..000000000
--- a/toolkit/components/satchel/test/browser/browser_privbrowsing_perwindowpb.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/* 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/. */
-
-var FormHistory = (Components.utils.import("resource://gre/modules/FormHistory.jsm", {})).FormHistory;
-
-/** Test for Bug 472396 **/
-add_task(function* test() {
-  // initialization
-  let windowsToClose = [];
-  let testURI =
-    "http://example.com/tests/toolkit/components/satchel/test/subtst_privbrowsing.html";
-
-  function* doTest(aShouldValueExist, aWindow) {
-    let browser = aWindow.gBrowser.selectedBrowser;
-    BrowserTestUtils.loadURI(browser, testURI);
-    yield BrowserTestUtils.browserLoaded(browser);
-
-    // Wait for the page to reload itself.
-    yield BrowserTestUtils.browserLoaded(browser);
-
-    let count = 0;
-    let doneCounting = {};
-    doneCounting.promise = new Promise(resolve => doneCounting.resolve = resolve);
-    FormHistory.count({ fieldname: "field", value: "value" },
-                      {
-                        handleResult(result) {
-                          count = result;
-                        },
-                        handleError(error) {
-                          do_throw("Error occurred searching form history: " + error);
-                        },
-                        handleCompletion(num) {
-                          if (aShouldValueExist) {
-                            is(count, 1, "In non-PB mode, we add a single entry");
-                          } else {
-                            is(count, 0, "In PB mode, we don't add any entries");
-                          }
-
-                          doneCounting.resolve();
-                        }
-                      });
-    yield doneCounting.promise;
-  }
-
-  function testOnWindow(aOptions, aCallback) {
-    return BrowserTestUtils.openNewBrowserWindow(aOptions)
-                           .then(win => { windowsToClose.push(win); return win; });
-  }
-
-
-  yield testOnWindow({private: true}).then((aWin) => {
-    return Task.spawn(doTest(false, aWin));
-  });
-
-  // Test when not on private mode after visiting a site on private
-  // mode. The form history should not exist.
-  yield testOnWindow({}).then((aWin) => {
-    return Task.spawn(doTest(true, aWin));
-  });
-
-  yield Promise.all(windowsToClose.map(win => BrowserTestUtils.closeWindow(win)));
-});
diff --git a/toolkit/components/satchel/test/mochitest.ini b/toolkit/components/satchel/test/mochitest.ini
deleted file mode 100644
index 5a65baeb6..000000000
--- a/toolkit/components/satchel/test/mochitest.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[DEFAULT]
-skip-if = toolkit == 'android' || os == 'linux' # linux - bug 1022386
-support-files =
-  satchel_common.js
-  subtst_form_submission_1.html
-  subtst_privbrowsing.html
-  parent_utils.js
-
-[test_bug_511615.html]
-[test_bug_787624.html]
-[test_datalist_with_caching.html]
-[test_form_autocomplete.html]
-[test_form_autocomplete_with_list.html]
-[test_form_submission.html]
-[test_form_submission_cap.html]
-[test_form_submission_cap2.html]
-[test_password_autocomplete.html]
-[test_popup_direction.html]
-[test_popup_enter_event.html]
diff --git a/toolkit/components/satchel/test/parent_utils.js b/toolkit/components/satchel/test/parent_utils.js
deleted file mode 100644
index 87738bdb5..000000000
--- a/toolkit/components/satchel/test/parent_utils.js
+++ /dev/null
@@ -1,149 +0,0 @@
-const { classes: Cc, interfaces: Ci, utils: Cu } = Components;
-
-Cu.import("resource://gre/modules/FormHistory.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://testing-common/ContentTaskUtils.jsm");
-
-var gAutocompletePopup = Services.ww.activeWindow.
-                                   document.
-                                   getElementById("PopupAutoComplete");
-assert.ok(gAutocompletePopup, "Got autocomplete popup");
-
-var ParentUtils = {
-  getMenuEntries() {
-    let entries = [];
-    let numRows = gAutocompletePopup.view.matchCount;
-    for (let i = 0; i < numRows; i++) {
-      entries.push(gAutocompletePopup.view.getValueAt(i));
-    }
-    return entries;
-  },
-
-  cleanUpFormHist() {
-    FormHistory.update({ op: "remove" });
-  },
-
-  updateFormHistory(changes) {
-    let handler = {
-      handleError: function (error) {
-        assert.ok(false, error);
-        sendAsyncMessage("formHistoryUpdated", { ok: false });
-      },
-      handleCompletion: function (reason) {
-        if (!reason)
-          sendAsyncMessage("formHistoryUpdated", { ok: true });
-      },
-    };
-    FormHistory.update(changes, handler);
-  },
-
-  popupshownListener() {
-    let results = this.getMenuEntries();
-    sendAsyncMessage("onpopupshown", { results });
-  },
-
-  countEntries(name, value) {
-    let obj = {};
-    if (name)
-      obj.fieldname = name;
-    if (value)
-      obj.value = value;
-
-    let count = 0;
-    let listener = {
-      handleResult(result) { count = result },
-      handleError(error) {
-        assert.ok(false, error);
-        sendAsyncMessage("entriesCounted", { ok: false });
-      },
-      handleCompletion(reason) {
-        if (!reason) {
-          sendAsyncMessage("entriesCounted", { ok: true, count });
-        }
-      }
-    };
-
-    FormHistory.count(obj, listener);
-  },
-
-  checkRowCount(expectedCount, expectedFirstValue = null) {
-    ContentTaskUtils.waitForCondition(() => {
-      // This may be called before gAutocompletePopup has initialised
-      // which causes it to throw
-      try {
-        return gAutocompletePopup.view.matchCount === expectedCount &&
-          (!expectedFirstValue ||
-           expectedCount <= 1 ||
-           gAutocompletePopup.view.getValueAt(0) === expectedFirstValue);
-      } catch (e) {
-        return false;
-      }
-    }, "Waiting for row count change: " + expectedCount + " First value: " + expectedFirstValue).then(() => {
-      let results = this.getMenuEntries();
-      sendAsyncMessage("gotMenuChange", { results });
-    });
-  },
-
-  checkSelectedIndex(expectedIndex) {
-    ContentTaskUtils.waitForCondition(() => {
-      return gAutocompletePopup.popupOpen &&
-             gAutocompletePopup.selectedIndex === expectedIndex;
-    }, "Checking selected index").then(() => {
-      sendAsyncMessage("gotSelectedIndex");
-    });
-  },
-
-  getPopupState() {
-    sendAsyncMessage("gotPopupState", {
-      open: gAutocompletePopup.popupOpen,
-      selectedIndex: gAutocompletePopup.selectedIndex,
-      direction: gAutocompletePopup.style.direction,
-    });
-  },
-
-  observe(subject, topic, data) {
-    assert.ok(topic === "satchel-storage-changed");
-    sendAsyncMessage("satchel-storage-changed", { subject: null, topic, data });
-  },
-
-  cleanup() {
-    gAutocompletePopup.removeEventListener("popupshown", this._popupshownListener);
-    this.cleanUpFormHist();
-  }
-};
-
-ParentUtils._popupshownListener =
-  ParentUtils.popupshownListener.bind(ParentUtils);
-gAutocompletePopup.addEventListener("popupshown", ParentUtils._popupshownListener);
-ParentUtils.cleanUpFormHist();
-
-addMessageListener("updateFormHistory", (msg) => {
-  ParentUtils.updateFormHistory(msg.changes);
-});
-
-addMessageListener("countEntries", ({ name, value }) => {
-  ParentUtils.countEntries(name, value);
-});
-
-addMessageListener("waitForMenuChange", ({ expectedCount, expectedFirstValue }) => {
-  ParentUtils.checkRowCount(expectedCount, expectedFirstValue);
-});
-
-addMessageListener("waitForSelectedIndex", ({ expectedIndex }) => {
-  ParentUtils.checkSelectedIndex(expectedIndex);
-});
-
-addMessageListener("getPopupState", () => {
-  ParentUtils.getPopupState();
-});
-
-addMessageListener("addObserver", () => {
-  Services.obs.addObserver(ParentUtils, "satchel-storage-changed", false);
-});
-addMessageListener("removeObserver", () => {
-  Services.obs.removeObserver(ParentUtils, "satchel-storage-changed");
-});
-
-addMessageListener("cleanup", () => {
-  ParentUtils.cleanup();
-});
diff --git a/toolkit/components/satchel/test/satchel_common.js b/toolkit/components/satchel/test/satchel_common.js
deleted file mode 100644
index c047f40af..000000000
--- a/toolkit/components/satchel/test/satchel_common.js
+++ /dev/null
@@ -1,274 +0,0 @@
-/* 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/. */
-
-var gPopupShownExpected = false;
-var gPopupShownListener;
-var gLastAutoCompleteResults;
-var gChromeScript;
-
-/*
- * Returns the element with the specified |name| attribute.
- */
-function $_(formNum, name) {
-  var form = document.getElementById("form" + formNum);
-  if (!form) {
-    ok(false, "$_ couldn't find requested form " + formNum);
-    return null;
-  }
-
-  var element = form.elements.namedItem(name);
-  if (!element) {
-    ok(false, "$_ couldn't find requested element " + name);
-    return null;
-  }
-
-  // Note that namedItem is a bit stupid, and will prefer an
-  // |id| attribute over a |name| attribute when looking for
-  // the element.
-
-  if (element.hasAttribute("name") && element.getAttribute("name") != name) {
-    ok(false, "$_ got confused.");
-    return null;
-  }
-
-  return element;
-}
-
-// Mochitest gives us a sendKey(), but it's targeted to a specific element.
-// This basically sends an untargeted key event, to whatever's focused.
-function doKey(aKey, modifier) {
-    var keyName = "DOM_VK_" + aKey.toUpperCase();
-    var key = SpecialPowers.Ci.nsIDOMKeyEvent[keyName];
-
-    // undefined --> null
-    if (!modifier)
-        modifier = null;
-
-    // Window utils for sending fake key events.
-    var wutils = SpecialPowers.getDOMWindowUtils(window);
-
-    if (wutils.sendKeyEvent("keydown",  key, 0, modifier)) {
-      wutils.sendKeyEvent("keypress", key, 0, modifier);
-    }
-    wutils.sendKeyEvent("keyup",    key, 0, modifier);
-}
-
-function registerPopupShownListener(listener) {
-  if (gPopupShownListener) {
-    ok(false, "got too many popupshownlisteners");
-    return;
-  }
-  gPopupShownListener = listener;
-}
-
-function getMenuEntries() {
-  if (!gLastAutoCompleteResults) {
-    throw new Error("no autocomplete results");
-  }
-
-  var results = gLastAutoCompleteResults;
-  gLastAutoCompleteResults = null;
-  return results;
-}
-
-function checkArrayValues(actualValues, expectedValues, msg) {
-  is(actualValues.length, expectedValues.length, "Checking array values: " + msg);
-  for (var i = 0; i < expectedValues.length; i++)
-    is(actualValues[i], expectedValues[i], msg + " Checking array entry #" + i);
-}
-
-var checkObserver = {
-  verifyStack: [],
-  callback: null,
-
-  init() {
-    gChromeScript.sendAsyncMessage("addObserver");
-    gChromeScript.addMessageListener("satchel-storage-changed", this.observe.bind(this));
-  },
-
-  uninit() {
-    gChromeScript.sendAsyncMessage("removeObserver");
-  },
-
-  waitForChecks: function(callback) {
-    if (this.verifyStack.length == 0)
-      callback();
-    else
-      this.callback = callback;
-  },
-
-  observe: function({ subject, topic, data }) {
-    if (data != "formhistory-add" && data != "formhistory-update")
-      return;
-    ok(this.verifyStack.length > 0, "checking if saved form data was expected");
-
-    // Make sure that every piece of data we expect to be saved is saved, and no
-    // more. Here it is assumed that for every entry satchel saves or modifies, a
-    // message is sent.
-    //
-    // We don't actually check the content of the message, but just that the right
-    // quantity of messages is received.
-    // - if there are too few messages, test will time out
-    // - if there are too many messages, test will error out here
-    //
-    var expected = this.verifyStack.shift();
-
-    countEntries(expected.name, expected.value,
-      function(num) {
-        ok(num > 0, expected.message);
-        if (checkObserver.verifyStack.length == 0) {
-          var callback = checkObserver.callback;
-          checkObserver.callback = null;
-          callback();
-        }
-      });
-  }
-};
-
-function checkForSave(name, value, message) {
-  checkObserver.verifyStack.push({ name : name, value: value, message: message });
-}
-
-function getFormSubmitButton(formNum) {
-  var form = $("form" + formNum); // by id, not name
-  ok(form != null, "getting form " + formNum);
-
-  // we can't just call form.submit(), because that doesn't seem to
-  // invoke the form onsubmit handler.
-  var button = form.firstChild;
-  while (button && button.type != "submit") { button = button.nextSibling; }
-  ok(button != null, "getting form submit button");
-
-  return button;
-}
-
-// Count the number of entries with the given name and value, and call then(number)
-// when done. If name or value is null, then the value of that field does not matter.
-function countEntries(name, value, then = null) {
-  return new Promise(resolve => {
-    gChromeScript.sendAsyncMessage("countEntries", { name, value });
-    gChromeScript.addMessageListener("entriesCounted", function counted(data) {
-      gChromeScript.removeMessageListener("entriesCounted", counted);
-      if (!data.ok) {
-        ok(false, "Error occurred counting form history");
-        SimpleTest.finish();
-        return;
-      }
-
-      if (then) {
-        then(data.count);
-      }
-      resolve(data.count);
-    });
-  });
-}
-
-// Wrapper around FormHistory.update which handles errors. Calls then() when done.
-function updateFormHistory(changes, then = null) {
-  return new Promise(resolve => {
-    gChromeScript.sendAsyncMessage("updateFormHistory", { changes });
-    gChromeScript.addMessageListener("formHistoryUpdated", function updated({ ok }) {
-      gChromeScript.removeMessageListener("formHistoryUpdated", updated);
-      if (!ok) {
-        ok(false, "Error occurred updating form history");
-        SimpleTest.finish();
-        return;
-      }
-
-      if (then) {
-        then();
-      }
-      resolve();
-    });
-  });
-}
-
-function notifyMenuChanged(expectedCount, expectedFirstValue, then = null) {
-  return new Promise(resolve => {
-    gChromeScript.sendAsyncMessage("waitForMenuChange",
-                            { expectedCount,
-                              expectedFirstValue });
-    gChromeScript.addMessageListener("gotMenuChange", function changed({ results }) {
-      gChromeScript.removeMessageListener("gotMenuChange", changed);
-      gLastAutoCompleteResults = results;
-      if (then) {
-        then(results);
-      }
-      resolve(results);
-    });
-  });
-}
-
-function notifySelectedIndex(expectedIndex, then = null) {
-  return new Promise(resolve => {
-    gChromeScript.sendAsyncMessage("waitForSelectedIndex", { expectedIndex });
-    gChromeScript.addMessageListener("gotSelectedIndex", function changed() {
-      gChromeScript.removeMessageListener("gotSelectedIndex", changed);
-      if (then) {
-        then();
-      }
-      resolve();
-    });
-  });
-}
-
-function getPopupState(then = null) {
-  return new Promise(resolve => {
-    gChromeScript.sendAsyncMessage("getPopupState");
-    gChromeScript.addMessageListener("gotPopupState", function listener(state) {
-      gChromeScript.removeMessageListener("gotPopupState", listener);
-      if (then) {
-        then(state);
-      }
-      resolve(state);
-    });
-  });
-}
-
-function listenForUnexpectedPopupShown() {
-  gPopupShownListener = function onPopupShown() {
-    if (!gPopupShownExpected) {
-      ok(false, "Unexpected autocomplete popupshown event");
-    }
-  };
-}
-
-function* promiseNoUnexpectedPopupShown() {
-  gPopupShownExpected = false;
-  listenForUnexpectedPopupShown();
-  SimpleTest.requestFlakyTimeout("Giving a chance for an unexpected popupshown to occur");
-  yield new Promise(resolve => setTimeout(resolve, 1000));
-}
-
-/**
- * Resolve at the next popupshown event for the autocomplete popup
- * @return {Promise} with the results
- */
-function promiseACShown() {
-  gPopupShownExpected = true;
-  return new Promise(resolve => {
-    gPopupShownListener = ({ results }) => {
-      gPopupShownExpected = false;
-      resolve(results);
-    };
-  });
-}
-
-function satchelCommonSetup() {
-  var chromeURL = SimpleTest.getTestFileURL("parent_utils.js");
-  gChromeScript = SpecialPowers.loadChromeScript(chromeURL);
-  gChromeScript.addMessageListener("onpopupshown", ({ results }) => {
-    gLastAutoCompleteResults = results;
-    if (gPopupShownListener)
-      gPopupShownListener({results});
-  });
-
-  SimpleTest.registerCleanupFunction(() => {
-    gChromeScript.sendAsyncMessage("cleanup");
-    gChromeScript.destroy();
-  });
-}
-
-
-satchelCommonSetup();
diff --git a/toolkit/components/satchel/test/subtst_form_submission_1.html b/toolkit/components/satchel/test/subtst_form_submission_1.html
deleted file mode 100644
index f7441668a..000000000
--- a/toolkit/components/satchel/test/subtst_form_submission_1.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-
-<head>
-</head>
-
-<body>
-
-<form id="subform1" onsubmit="return checkSubmit(21)">
-  <input id="subtest1" type="text" name="subtest1">
-  <button type="submit">Submit</button>
-</form>
-
-<form id="subform2" onsubmit="return checkSubmit(100)">
-  <input id="subtest2" type="text" name="subtest2">
-  <button type="submit">Submit</button>
-</form>
-
-<script>
-  function checkSubmit(num) {
-    netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-    return parent.checkSubmit(num);
-  }
-
-  function clickButton(num) {
-    if (num == 21)
-      document.querySelectorAll("button")[0].click();
-    else if (num == 100)
-      document.querySelectorAll("button")[1].click();
-  }
-
-  // set the input's value (can't use a default value, as satchel will ignore it)
-  document.getElementById("subtest1").value = "subtestValue";
-  document.getElementById("subtest2").value = "subtestValue";
-</script>
-
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/subtst_privbrowsing.html b/toolkit/components/satchel/test/subtst_privbrowsing.html
deleted file mode 100644
index b53e0b229..000000000
--- a/toolkit/components/satchel/test/subtst_privbrowsing.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-<head>
-  <meta charset=UTF-8>
-  <title>Subtest for bug 472396</title>
-  <script>
-  function submitForm() {
-    if (location.search.indexOf("field") == -1) {
-      var form  = document.getElementById("form");
-      var field = document.getElementById("field");
-      field.value = "value";
-      form.submit();
-    }
-  }
-  </script>
-</head>
-<body onload="submitForm();">
-  <h2>Subtest for bug 472396</h2>
-  <form id="form">
-    <input name="field" id="field">
-  </form>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/test_bug_511615.html b/toolkit/components/satchel/test/test_bug_511615.html
deleted file mode 100644
index 66972d9b3..000000000
--- a/toolkit/components/satchel/test/test_bug_511615.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for Form History Autocomplete Untrusted Events: Bug 511615</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-Test for Form History Autocomplete Untrusted Events: Bug 511615
-<p id="display"></p>
-
-<!-- we presumably can't hide the content for this test. -->
-<div id="content">
-  <!-- normal, basic form -->
-  <form id="form1" onsubmit="return false;">
-    <input  type="text" name="field1">
-    <button type="submit">Submit</button>
-  </form>
-</div>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-var resolvePopupShownListener;
-registerPopupShownListener(() => resolvePopupShownListener());
-
-function waitForNextPopup() {
-  return new Promise(resolve => { resolvePopupShownListener = resolve; });
-}
-
-/**
- * Indicates the time to wait before checking that the state of the autocomplete
- * popup, including whether it is open, has not changed in response to events.
- *
- * Manual testing on a fast machine revealed that 80ms was still unreliable,
- * while 100ms detected a simulated failure reliably. Unfortunately, this means
- * that to take into account slower machines we should use a larger value.
- *
- * Note that if a machine takes more than this time to show the popup, this
- * would not cause a failure, conversely the machine would not be able to detect
- * whether the test should have failed. In other words, this use of timeouts is
- * never expected to cause intermittent failures with test automation.
- */
-const POPUP_RESPONSE_WAIT_TIME_MS = 200;
-
-SimpleTest.requestFlakyTimeout("Must ensure that an event does not happen.");
-
-/**
- * Checks that the popup does not open in response to the given function.
- */
-function expectPopupDoesNotOpen(triggerFn) {
-  let popupShown = waitForNextPopup();
-  triggerFn();
-  return Promise.race([
-    popupShown.then(() => Promise.reject("Popup opened unexpectedly.")),
-    new Promise(resolve => setTimeout(resolve, POPUP_RESPONSE_WAIT_TIME_MS)),
-  ]);
-}
-
-/**
- * Checks that the selected index in the popup still matches the given value.
- */
-function checkSelectedIndexAfterResponseTime(expectedIndex) {
-  return new Promise(resolve => {
-    setTimeout(() => getPopupState(resolve), POPUP_RESPONSE_WAIT_TIME_MS);
-  }).then(popupState => {
-    is(popupState.open, true, "Popup should still be open.");
-    is(popupState.selectedIndex, expectedIndex, "Selected index should match.");
-  });
-}
-
-function doKeyUnprivileged(key) {
-  let keyName = "DOM_VK_" + key.toUpperCase();
-  let keycode, charcode;
-
-  if (key.length == 1) {
-      keycode = 0;
-      charcode = key.charCodeAt(0);
-      alwaysval = charcode;
-  } else {
-      keycode = KeyEvent[keyName];
-      if (!keycode)
-          throw "invalid keyname in test";
-      charcode = 0;
-      alwaysval = keycode;
-  }
-
-  let dnEvent = document.createEvent('KeyboardEvent');
-  let prEvent = document.createEvent('KeyboardEvent');
-  let upEvent = document.createEvent('KeyboardEvent');
-
-  dnEvent.initKeyEvent("keydown",  true, true, null, false, false, false, false, alwaysval, 0);
-  prEvent.initKeyEvent("keypress", true, true, null, false, false, false, false, keycode, charcode);
-  upEvent.initKeyEvent("keyup",    true, true, null, false, false, false, false, alwaysval, 0);
-
-  input.dispatchEvent(dnEvent);
-  input.dispatchEvent(prEvent);
-  input.dispatchEvent(upEvent);
-}
-
-function doClickWithMouseEventUnprivileged() {
-  let dnEvent = document.createEvent('MouseEvent');
-  let upEvent = document.createEvent('MouseEvent');
-  let ckEvent = document.createEvent('MouseEvent');
-
-  dnEvent.initMouseEvent("mousedown",  true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null);
-  upEvent.initMouseEvent("mouseup",    true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null);
-  ckEvent.initMouseEvent("mouseclick", true, true, window, 1, 0, 0, 0, 0, false, false, false, false, 0, null);
-
-  input.dispatchEvent(dnEvent);
-  input.dispatchEvent(upEvent);
-  input.dispatchEvent(ckEvent);
-}
-
-let input = $_(1, "field1");
-
-add_task(function* test_initialize() {
-  yield new Promise(resolve => updateFormHistory([
-    { op : "remove" },
-    { op : "add", fieldname : "field1", value : "value1" },
-    { op : "add", fieldname : "field1", value : "value2" },
-    { op : "add", fieldname : "field1", value : "value3" },
-    { op : "add", fieldname : "field1", value : "value4" },
-    { op : "add", fieldname : "field1", value : "value5" },
-    { op : "add", fieldname : "field1", value : "value6" },
-    { op : "add", fieldname : "field1", value : "value7" },
-    { op : "add", fieldname : "field1", value : "value8" },
-    { op : "add", fieldname : "field1", value : "value9" },
-  ], resolve));
-});
-
-add_task(function* test_untrusted_events_ignored() {
-  // The autocomplete popup should not open from untrusted events.
-  for (let triggerFn of [
-    () => input.focus(),
-    () => input.click(),
-    () => doClickWithMouseEventUnprivileged(),
-    () => doKeyUnprivileged("down"),
-    () => doKeyUnprivileged("page_down"),
-    () => doKeyUnprivileged("return"),
-    () => doKeyUnprivileged("v"),
-    () => doKeyUnprivileged(" "),
-    () => doKeyUnprivileged("back_space"),
-  ]) {
-    // We must wait for the entire timeout for each individual test, because the
-    // next event in the list might prevent the popup from opening.
-    yield expectPopupDoesNotOpen(triggerFn);
-  }
-
-  // A privileged key press will actually open the popup.
-  let popupShown = waitForNextPopup();
-  doKey("down");
-  yield popupShown;
-
-  // The selected autocomplete item should not change from untrusted events.
-  for (let triggerFn of [
-    () => doKeyUnprivileged("down"),
-    () => doKeyUnprivileged("page_down"),
-  ]) {
-    triggerFn();
-    yield checkSelectedIndexAfterResponseTime(-1);
-  }
-
-  // A privileged key press will actually change the selected index.
-  let indexChanged = new Promise(resolve => notifySelectedIndex(0, resolve));
-  doKey("down");
-  yield indexChanged;
-
-  // The selected autocomplete item should not change and it should not be
-  // possible to use it from untrusted events.
-  for (let triggerFn of [
-    () => doKeyUnprivileged("down"),
-    () => doKeyUnprivileged("page_down"),
-    () => doKeyUnprivileged("right"),
-    () => doKeyUnprivileged(" "),
-    () => doKeyUnprivileged("back_space"),
-    () => doKeyUnprivileged("back_space"),
-    () => doKeyUnprivileged("return"),
-  ]) {
-    triggerFn();
-    yield checkSelectedIndexAfterResponseTime(0);
-    is(input.value, "", "The selected item should not have been used.");
-  }
-
-  // Close the popup.
-  input.blur();
-});
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/test_bug_787624.html b/toolkit/components/satchel/test/test_bug_787624.html
deleted file mode 100644
index 6ca5136cd..000000000
--- a/toolkit/components/satchel/test/test_bug_787624.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for Layout of Form History Autocomplete: Bug 787624</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-  <style>
-    .container {
-        border: 1px solid #333;
-        width: 80px;
-        height: 26px;
-        position: absolute;
-        z-index: 2;
-    }
-
-    .subcontainer {
-        width: 100%;
-        overflow: hidden;
-    }
-
-    .subcontainer input {
-        width: 120px;
-        margin: 2px 6px;
-        padding-right: 4px;
-        border: none;
-        height: 22px;
-        z-index: 1;
-        outline: 1px dashed #555
-    }
-  </style>
-</head>
-<body>
-Form History Layout test: form field autocomplete: Bug 787624
-<p id="display"></p>
-
-<!-- we presumably can't hide the content for this test. -->
-<div id="content">
-  <!-- in this form, the input field is partially hidden and can scroll -->
-  <div class="container">
-    <div class="subcontainer">
-      <form id="form1" onsubmit="return false;">
-        <input  type="text" name="field1">
-        <button type="submit">Submit</button>
-      </form>
-    </div>
-  </div>
-</div>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Form History autocomplete Layout: Bug 787624 **/
-
-var resolvePopupShownListener;
-registerPopupShownListener(() => resolvePopupShownListener());
-
-function waitForNextPopup() {
-  return new Promise(resolve => { resolvePopupShownListener = resolve; });
-}
-
-add_task(function* test_popup_not_move_input() {
-  var input = $_(1, "field1");
-  var rect = input.getBoundingClientRect();
-
-  yield new Promise(resolve => updateFormHistory([
-    { op : "remove" },
-    { op : "add", fieldname : "field1", value : "value1" },
-    { op : "add", fieldname : "field1", value : "value2" },
-  ], resolve));
-
-  let popupShown = waitForNextPopup();
-  input.focus();
-  doKey("down");
-  yield popupShown;
-
-  var newRect = input.getBoundingClientRect();
-  is(newRect.left, rect.left,
-    "autocomplete popup does not disturb the input position");
-  is(newRect.top, rect.top,
-    "autocomplete popup does not disturb the input position");
-});
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/test_datalist_with_caching.html b/toolkit/components/satchel/test/test_datalist_with_caching.html
deleted file mode 100644
index 8445cb159..000000000
--- a/toolkit/components/satchel/test/test_datalist_with_caching.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for Form History Autocomplete</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-Form History test: form field autocomplete
-<p id="display"></p>
-
-<!-- we presumably can't hide the content for this test. -->
-<div id="content">
-
-  <!-- normal, basic form -->
-  <form id="form1" onsubmit="return false;">
-    <input list="suggest" type="text" name="field1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <datalist id="suggest">
-    <option value="First"></option>
-    <option value="Second"></option>
-    <option value="Secomundo"></option>
-  </datalist>
-</div>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-var input = $_(1, "field1");
-
-function setupFormHistory(aCallback) {
-  updateFormHistory([
-    { op : "remove" },
-    { op : "add", fieldname : "field1", value : "Sec" },
-  ], () => {
-    spawn_task(aCallback);
-  });
-}
-
-function setForm(value) {
-  input.value = value;
-  input.focus();
-}
-
-// Restore the form to the default state.
-function restoreForm() {
-  setForm("");
-}
-
-// Check for expected form data.
-function checkForm(expectedValue) {
-  var formID = input.parentNode.id;
-  is(input.value, expectedValue, "Checking " + formID + " input");
-}
-
-SimpleTest.waitForExplicitFinish();
-
-var expectingPopup = null;
-
-function expectPopup() {
-  info("expecting a popup");
-  return new Promise(resolve => {
-    expectingPopup = resolve;
-  });
-}
-
-var testNum = 0;
-
-function popupShownListener() {
-  info("popup shown for test " + testNum);
-  if (expectingPopup) {
-    expectingPopup();
-    expectingPopup = null;
-  }
-  else {
-    ok(false, "Autocomplete popup not expected during test " + testNum);
-  }
-}
-
-function waitForMenuChange(expectedCount) {
-  return new Promise(resolve => {
-    notifyMenuChanged(expectedCount, null, resolve);
-  });
-}
-
-registerPopupShownListener(popupShownListener);
-
-function checkMenuEntries(expectedValues) {
-  var actualValues = getMenuEntries();
-  is(actualValues.length, expectedValues.length, testNum + " Checking length of expected menu");
-  for (var i = 0; i < expectedValues.length; i++)
-    is(actualValues[i], expectedValues[i], testNum + " Checking menu entry #"+i);
-}
-
-function* runTests() {
-  testNum++;
-  restoreForm();
-  doKey("down");
-  yield expectPopup();
-
-  checkMenuEntries(["Sec", "First", "Second", "Secomundo"]);
-  doKey("down");
-  doKey("return");
-  checkForm("Sec");
-
-  testNum++;
-  restoreForm();
-  sendString("Sec");
-  doKey("down");
-  yield expectPopup();
-
-  testNum++;
-  checkMenuEntries(["Sec", "Second", "Secomundo"]);
-  sendString("o");
-  yield waitForMenuChange(2);
-
-  testNum++;
-  checkMenuEntries(["Second", "Secomundo"]);
-  doKey("down");
-  doKey("return");
-  checkForm("Second");
-  SimpleTest.finish();
-}
-
-function startTest() {
-  setupFormHistory(runTests);
-}
-
-window.onload = startTest;
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/test_form_autocomplete.html b/toolkit/components/satchel/test/test_form_autocomplete.html
deleted file mode 100644
index d2c22a3db..000000000
--- a/toolkit/components/satchel/test/test_form_autocomplete.html
+++ /dev/null
@@ -1,1074 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for Form History Autocomplete</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-Form History test: form field autocomplete
-<p id="display"></p>
-
-<!-- We presumably can't hide the content for this test. The large top padding is to allow
-     listening for scrolls to occur. -->
-<div id="content" style="padding-top: 20000px;">
-
-  <!-- normal, basic form -->
-  <form id="form1" onsubmit="return false;">
-    <input  type="text" name="field1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- normal, basic form (new fieldname) -->
-  <form id="form2" onsubmit="return false;">
-    <input  type="text" name="field2">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with autocomplete=off on input -->
-  <form id="form3" onsubmit="return false;">
-    <input  type="text" name="field2" autocomplete="off">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with autocomplete=off on form -->
-  <form id="form4" autocomplete="off" onsubmit="return false;">
-    <input  type="text" name="field2">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- normal form for testing filtering -->
-  <form id="form5" onsubmit="return false;">
-    <input  type="text" name="field3">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- normal form for testing word boundary filtering -->
-  <form id="form6" onsubmit="return false;">
-    <input  type="text" name="field4">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with maxlength attribute on input -->
-  <form id="form7" onsubmit="return false;">
-    <input  type="text" name="field5" maxlength="10">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='email' -->
-  <form id="form8" onsubmit="return false;">
-    <input  type="email" name="field6">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='tel' -->
-  <form id="form9" onsubmit="return false;">
-    <input  type="tel" name="field7">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='url' -->
-  <form id="form10" onsubmit="return false;">
-    <input  type="url" name="field8">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='search' -->
-  <form id="form11" onsubmit="return false;">
-    <input  type="search" name="field9">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='number' -->
-  <form id="form12" onsubmit="return false;">
-    <input  type="text" name="field10"> <!-- TODO: change back to type=number -->
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- normal, basic form (with fieldname='searchbar-history') -->
-  <form id="form13" onsubmit="return false;">
-    <input  type="text" name="searchbar-history">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='date' -->
-  <form id="form14" onsubmit="return false;">
-    <input  type="date" name="field11">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='time' -->
-  <form id="form15" onsubmit="return false;">
-    <input  type="time" name="field12">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='range' -->
-  <form id="form16" onsubmit="return false;">
-    <input  type="range" name="field13" max="64">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='color' -->
-  <form id="form17" onsubmit="return false;">
-    <input  type="color" name="field14">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='month' -->
-  <form id="form18" onsubmit="return false;">
-    <input  type="month" name="field15">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='week' -->
-  <form id="form19" onsubmit="return false;">
-    <input  type="week" name="field16">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with input type='datetime-local' -->
-  <form id="form20" onsubmit="return false;">
-    <input  type="datetime-local" name="field17">
-    <button type="submit">Submit</button>
-  </form>
-
-</div>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Form History autocomplete **/
-
-var input = $_(1, "field1");
-const shiftModifier = Event.SHIFT_MASK;
-
-function setupFormHistory(aCallback) {
-  updateFormHistory([
-    { op : "remove" },
-    { op : "add", fieldname : "field1", value : "value1" },
-    { op : "add", fieldname : "field1", value : "value2" },
-    { op : "add", fieldname : "field1", value : "value3" },
-    { op : "add", fieldname : "field1", value : "value4" },
-    { op : "add", fieldname : "field2", value : "value1" },
-    { op : "add", fieldname : "field3", value : "a" },
-    { op : "add", fieldname : "field3", value : "aa" },
-    { op : "add", fieldname : "field3", value : "aaz" },
-    { op : "add", fieldname : "field3", value : "aa\xe6" }, // 0xae == latin ae pair (0xc6 == AE)
-    { op : "add", fieldname : "field3", value : "az" },
-    { op : "add", fieldname : "field3", value : "z" },
-    { op : "add", fieldname : "field4", value : "a\xe6" },
-    { op : "add", fieldname : "field4", value : "aa a\xe6" },
-    { op : "add", fieldname : "field4", value : "aba\xe6" },
-    { op : "add", fieldname : "field4", value : "bc d\xe6" },
-    { op : "add", fieldname : "field5", value : "1" },
-    { op : "add", fieldname : "field5", value : "12" },
-    { op : "add", fieldname : "field5", value : "123" },
-    { op : "add", fieldname : "field5", value : "1234" },
-    { op : "add", fieldname : "field6", value : "value" },
-    { op : "add", fieldname : "field7", value : "value" },
-    { op : "add", fieldname : "field8", value : "value" },
-    { op : "add", fieldname : "field9", value : "value" },
-    { op : "add", fieldname : "field10", value : "42" },
-    { op : "add", fieldname : "field11", value : "2010-10-10" }, // not used, since type=date doesn't have autocomplete currently
-    { op : "add", fieldname : "field12", value : "21:21" }, // not used, since type=time doesn't have autocomplete currently
-    { op : "add", fieldname : "field13", value : "32" },  // not used, since type=range doesn't have a drop down menu
-    { op : "add", fieldname : "field14", value : "#ffffff" }, // not used, since type=color doesn't have autocomplete currently
-    { op : "add", fieldname : "field15", value : "2016-08" },
-    { op : "add", fieldname : "field16", value : "2016-W32" },
-    { op : "add", fieldname : "field17", value : "2016-10-21T10:10" },
-    { op : "add", fieldname : "searchbar-history", value : "blacklist test" },
-  ], aCallback);
-}
-
-function setForm(value) {
-  input.value = value;
-  input.focus();
-}
-
-// Restore the form to the default state.
-function restoreForm() {
-  setForm("");
-}
-
-// Check for expected form data.
-function checkForm(expectedValue) {
-  var formID = input.parentNode.id;
-  is(input.value, expectedValue, "Checking " + formID + " input");
-}
-
-var testNum = 0;
-var expectingPopup = false;
-
-function expectPopup()
-{
-  info("expecting popup for test " + testNum);
-  expectingPopup = true;
-}
-
-function popupShownListener()
-{
-  info("popup shown for test " + testNum);
-  if (expectingPopup) {
-    expectingPopup = false;
-    SimpleTest.executeSoon(runTest);
-  }
-  else {
-    ok(false, "Autocomplete popup not expected during test " + testNum);
-  }
-}
-
-registerPopupShownListener(popupShownListener);
-
-/*
- * Main section of test...
- *
- * This is a bit hacky, as many operations happen asynchronously.
- * Various mechanisms call runTests as a result of operations:
- *   - set expectingPopup to true, and the next test will occur when the autocomplete popup is shown
- *   - call waitForMenuChange(x) to run the next test when the autocomplete popup to have x items in it
- *   - addEntry calls runs the test when an entry has been added
- *   - some tests scroll the window. This is because the form fill controller happens to scroll
- *     the field into view near the end of the search, and there isn't any other good notification
- *     to listen to for when the search is complete.
- *   - some items still use setTimeout
- */
-function runTest() {
-  testNum++;
-
-  ok(true, "Starting test #" + testNum);
-
-  switch (testNum) {
-    case 1:
-        // Make sure initial form is empty.
-        checkForm("");
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 2:
-        checkMenuEntries(["value1", "value2", "value3", "value4"], testNum);
-        // Check first entry
-        doKey("down");
-        checkForm(""); // value shouldn't update
-        doKey("return"); // not "enter"!
-        checkForm("value1");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 3:
-        // Check second entry
-        doKey("down");
-        doKey("down");
-        doKey("return"); // not "enter"!
-        checkForm("value2");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 4:
-        // Check third entry
-        doKey("down");
-        doKey("down");
-        doKey("down");
-        doKey("return");
-        checkForm("value3");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 5:
-        // Check fourth entry
-        doKey("down");
-        doKey("down");
-        doKey("down");
-        doKey("down");
-        doKey("return");
-        checkForm("value4");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 6:
-        // Check first entry (wraparound)
-        doKey("down");
-        doKey("down");
-        doKey("down");
-        doKey("down");
-        doKey("down"); // deselects
-        doKey("down");
-        doKey("return");
-        checkForm("value1");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 7:
-        // Check the last entry via arrow-up
-        doKey("up");
-        doKey("return");
-        checkForm("value4");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 8:
-        // Check the last entry via arrow-up
-        doKey("down"); // select first entry
-        doKey("up");   // selects nothing!
-        doKey("up");   // select last entry
-        doKey("return");
-        checkForm("value4");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 9:
-        // Check the last entry via arrow-up (wraparound)
-        doKey("down");
-        doKey("up"); // deselects
-        doKey("up"); // last entry
-        doKey("up");
-        doKey("up");
-        doKey("up"); // first entry
-        doKey("up"); // deselects
-        doKey("up"); // last entry
-        doKey("return");
-        checkForm("value4");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 10:
-        // Set first entry w/o triggering autocomplete
-        doKey("down");
-        doKey("right");
-        checkForm("value1");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 11:
-        // Set first entry w/o triggering autocomplete
-        doKey("down");
-        doKey("left");
-        checkForm("value1");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 12:
-        // Check first entry (page up)
-        doKey("down");
-        doKey("down");
-        doKey("page_up");
-        doKey("return");
-        checkForm("value1");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 13:
-        // Check last entry (page down)
-        doKey("down");
-        doKey("page_down");
-        doKey("return");
-        checkForm("value4");
-
-        // Trigger autocomplete popup
-        testNum = 49;
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    /* Test removing entries from the dropdown */
-
-    case 50:
-        checkMenuEntries(["value1", "value2", "value3", "value4"], testNum);
-        // Delete the first entry (of 4)
-        setForm("value");
-        doKey("down");
-
-        // On OS X, shift-backspace and shift-delete work, just delete does not.
-        // On Win/Linux, shift-backspace does not work, delete and shift-delete do.
-        if (SpecialPowers.OS == "Darwin")
-          doKey("back_space", shiftModifier);
-        else
-          doKey("delete", shiftModifier);
-
-        // This tests that on OS X shift-backspace didn't delete the last character
-        // in the input (bug 480262).
-        waitForMenuChange(3);
-        break;
-
-    case 51:
-        checkForm("value");
-        countEntries("field1", "value1",
-          function (num) {
-            ok(!num, testNum + " checking that f1/v1 was deleted");
-            runTest();
-          });
-        break;
-
-    case 52:
-        doKey("return");
-        checkForm("value2");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 53:
-        checkMenuEntries(["value2", "value3", "value4"], testNum);
-        // Check the new first entry (of 3)
-        doKey("down");
-        doKey("return");
-        checkForm("value2");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 54:
-        // Delete the second entry (of 3)
-        doKey("down");
-        doKey("down");
-        doKey("delete", shiftModifier);
-        waitForMenuChange(2);
-        break;
-
-    case 55:
-        checkForm("");
-        countEntries("field1", "value3",
-          function (num) {
-            ok(!num, testNum + " checking that f1/v3 was deleted");
-            runTest();
-          });
-        break;
-
-    case 56:
-        doKey("return");
-        checkForm("value4")
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 57:
-        checkMenuEntries(["value2", "value4"], testNum);
-        // Check the new first entry (of 2)
-        doKey("down");
-        doKey("return");
-        checkForm("value2");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 58:
-        // Delete the last entry (of 2)
-        doKey("down");
-        doKey("down");
-        doKey("delete", shiftModifier);
-        checkForm("");
-        waitForMenuChange(1);
-        break;
-
-    case 59:
-        countEntries("field1", "value4",
-          function (num) {
-            ok(!num, testNum + " checking that f1/v4 was deleted");
-            runTest();
-          });
-        break;
-
-    case 60:
-        doKey("return");
-        checkForm("value2");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 61:
-        checkMenuEntries(["value2"], testNum);
-        // Check the new first entry (of 1)
-        doKey("down");
-        doKey("return");
-        checkForm("value2");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 62:
-        // Delete the only remaining entry
-        doKey("down");
-        doKey("delete", shiftModifier);
-        waitForMenuChange(0);
-        break;
-
-    case 63:
-        checkForm("");
-        countEntries("field1", "value2",
-          function (num) {
-            ok(!num, testNum + " checking that f1/v2 was deleted");
-            runTest();
-          });
-        break;
-
-    case 64:
-        // Look at form 2, trigger autocomplete popup
-        input = $_(2, "field2");
-        testNum = 99;
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    /* Test entries with autocomplete=off */
-
-    case 100:
-        // Select first entry
-        doKey("down");
-        doKey("return");
-        checkForm("value1");
-
-        // Look at form 3, try to trigger autocomplete popup
-        input = $_(3, "field2");
-        restoreForm();
-        // Sometimes, this will fail if scrollTo(0, 0) is called, so that doesn't
-        // happen here. Fortunately, a different input is used from the last test,
-        // so a scroll should still occur.
-        doKey("down");
-        waitForScroll();
-        break;
-
-    case 101:
-        // Ensure there's no autocomplete dropdown (autocomplete=off is present)
-        doKey("down");
-        doKey("return");
-        checkForm("");
-
-        // Look at form 4, try to trigger autocomplete popup
-        input = $_(4, "field2");
-        restoreForm();
-        doKey("down");
-        waitForMenuChange(0);
-        break;
-
-    case 102:
-        // Ensure there's no autocomplete dropdown (autocomplete=off is present)
-        doKey("down");
-        doKey("return");
-        checkForm("");
-
-        // Look at form 5, try to trigger autocomplete popup
-        input = $_(5, "field3");
-        restoreForm();
-        testNum = 199;
-        expectPopup();
-        input.focus();
-        sendChar("a");
-        break;
-
-    /* Test filtering as characters are typed. */
-
-    case 200:
-        checkMenuEntries(["a", "aa", "aaz", "aa\xe6", "az"], testNum);
-        input.focus();
-        sendChar("a");
-        waitForMenuChange(3);
-        break;
-
-    case 201:
-        checkMenuEntries(["aa", "aaz", "aa\xe6"], testNum);
-        input.focus();
-        sendChar("\xc6");
-        waitForMenuChange(1);
-        break;
-
-    case 202:
-        checkMenuEntries(["aa\xe6"], testNum);
-        doKey("back_space");
-        waitForMenuChange(3);
-        break;
-
-    case 203:
-        checkMenuEntries(["aa", "aaz", "aa\xe6"], testNum);
-        doKey("back_space");
-        waitForMenuChange(5);
-        break;
-
-    case 204:
-        checkMenuEntries(["a", "aa", "aaz", "aa\xe6", "az"], testNum);
-        input.focus();
-        sendChar("z");
-        waitForMenuChange(2);
-        break;
-
-    case 205:
-        checkMenuEntries(["az", "aaz"], testNum);
-        input.focus();
-        doKey("left");
-        expectPopup();
-        // Check case-insensitivity.
-        sendChar("A");
-        break;
-
-    case 206:
-        checkMenuEntries(["aaz"], testNum);
-        addEntry("field3", "aazq");
-        break;
-
-    case 207:
-        // check that results were cached
-        input.focus();
-        doKey("right");
-        sendChar("q");
-        waitForMenuChange(0);
-        break;
-
-    case 208:
-        // check that results were cached
-        checkMenuEntries([], testNum);
-        addEntry("field3", "aazqq");
-        break;
-
-    case 209:
-        input.focus();
-        window.scrollTo(0, 0);
-        sendChar("q");
-        waitForMenuChange(0);
-        break;
-
-    case 210:
-        // check that empty results were cached - bug 496466
-        checkMenuEntries([], testNum);
-        doKey("escape");
-
-        // Look at form 6, try to trigger autocomplete popup
-        input = $_(6, "field4");
-        restoreForm();
-        testNum = 249;
-        expectPopup();
-        input.focus();
-        sendChar("a");
-        break;
-
-    /* Test substring matches and word boundary bonuses */
-
-    case 250:
-        // alphabetical results for first character
-        checkMenuEntries(["aa a\xe6", "aba\xe6", "a\xe6"], testNum);
-        input.focus();
-
-        sendChar("\xe6");
-        waitForMenuChange(3, "a\xe6");
-        break;
-
-    case 251:
-        // prefix match comes first, then word boundary match
-        // followed by substring match
-        checkMenuEntries(["a\xe6", "aa a\xe6", "aba\xe6"], testNum);
-
-        restoreForm();
-        input.focus();
-        sendChar("b");
-        waitForMenuChange(1, "bc d\xe6");
-        break;
-
-    case 252:
-        checkMenuEntries(["bc d\xe6"], testNum);
-        input.focus();
-        sendChar(" ");
-        waitForMenuChange(1);
-        break;
-
-    case 253:
-        // check that trailing space has no effect after single char.
-        checkMenuEntries(["bc d\xe6"], testNum);
-        input.focus();
-        sendChar("\xc6");
-        waitForMenuChange(2);
-        break;
-
-    case 254:
-        // check multi-word substring matches
-        checkMenuEntries(["bc d\xe6", "aba\xe6"]);
-        input.focus();
-        expectPopup();
-        doKey("left");
-        sendChar("d");
-        break;
-
-    case 255:
-        // check inserting in multi-word searches
-        checkMenuEntries(["bc d\xe6"], testNum);
-        input.focus();
-        sendChar("z");
-        waitForMenuChange(0);
-        break;
-
-    case 256:
-        checkMenuEntries([], testNum);
-
-        // Look at form 7, try to trigger autocomplete popup
-        input = $_(7, "field5");
-        testNum = 299;
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 300:
-        checkMenuEntries(["1", "12", "123", "1234"], testNum);
-        input.maxLength = 4;
-        expectPopup();
-        doKey("escape");
-        doKey("down");
-        break;
-
-    case 301:
-        checkMenuEntries(["1", "12", "123", "1234"], testNum);
-        input.maxLength = 3;
-        expectPopup();
-        doKey("escape");
-        doKey("down");
-        break;
-
-    case 302:
-        checkMenuEntries(["1", "12", "123"], testNum);
-        input.maxLength = 2;
-        expectPopup();
-        doKey("escape");
-        doKey("down");
-        break;
-
-    case 303:
-        checkMenuEntries(["1", "12"], testNum);
-        input.maxLength = 1;
-        expectPopup();
-        doKey("escape");
-        doKey("down");
-        break;
-
-    case 304:
-        checkMenuEntries(["1"], testNum);
-        input.maxLength = 0;
-        doKey("escape");
-        doKey("down");
-        waitForMenuChange(0);
-        break;
-
-    case 305:
-        checkMenuEntries([], testNum);
-        input.maxLength = 4;
-
-        // now again with a character typed
-        input.focus();
-        sendChar("1");
-        expectPopup();
-        doKey("escape");
-        doKey("down");
-        break;
-
-    case 306:
-        checkMenuEntries(["1", "12", "123", "1234"], testNum);
-        input.maxLength = 3;
-        expectPopup();
-        doKey("escape");
-        doKey("down");
-        break;
-
-    case 307:
-        checkMenuEntries(["1", "12", "123"], testNum);
-        input.maxLength = 2;
-        expectPopup();
-        doKey("escape");
-        doKey("down");
-        break;
-
-    case 308:
-        checkMenuEntries(["1", "12"], testNum);
-        input.maxLength = 1;
-        expectPopup();
-        doKey("escape");
-        doKey("down");
-        break;
-
-    case 309:
-        checkMenuEntries(["1"], testNum);
-        input.maxLength = 0;
-        doKey("escape");
-        doKey("down");
-        waitForMenuChange(0);
-        break;
-
-    case 310:
-        checkMenuEntries([], testNum);
-
-        input = $_(8, "field6");
-        testNum = 399;
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 400:
-    case 401:
-    case 402:
-    case 403:
-        checkMenuEntries(["value"], testNum);
-        doKey("down");
-        doKey("return");
-        checkForm("value");
-
-        if (testNum == 400) {
-          input = $_(9, "field7");
-        } else if (testNum == 401) {
-          input = $_(10, "field8");
-        } else if (testNum == 402) {
-          input = $_(11, "field9");
-        } else if (testNum == 403) {
-          todo(false, "Fix input type=number");
-          input = $_(12, "field10");
-        }
-
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 404:
-        checkMenuEntries(["42"], testNum);
-        doKey("down");
-        doKey("return");
-        checkForm("42");
-
-        input = $_(14, "field11");
-        restoreForm();
-        waitForMenuChange(0);
-        break;
-
-    case 405:
-        checkMenuEntries([]); // type=date with it's own control frame does not
-                              // have a drop down menu for now
-        checkForm("");
-
-        input = $_(15, "field12");
-        restoreForm();
-        waitForMenuChange(0);
-        break;
-
-    case 406:
-        checkMenuEntries([]); // type=time with it's own control frame does not
-                              // have a drop down menu for now
-        checkForm("");
-
-        input = $_(16, "field13");
-        restoreForm();
-        doKey("down");
-        waitForMenuChange(0);
-        break;
-
-    case 407:
-        checkMenuEntries([]); // type=range does not have a drop down menu
-        doKey("down");
-        doKey("return");
-        checkForm("30"); // default (midway between minimum (0) and maximum (64)) - step
-
-        input = $_(17, "field14");
-        restoreForm();
-        waitForMenuChange(0);
-        break;
-
-    case 408:
-        checkMenuEntries([]); // type=color does not have a drop down menu
-        checkForm("#000000"); // default color value
-
-        input = $_(18, "field15");
-        restoreForm();
-        expectPopup();
-        doKey("down");
-        break;
-
-    case 409:
-        checkMenuEntries(["2016-08"]);
-        doKey("down");
-        doKey("return");
-        checkForm("2016-08");
-
-        input = $_(19, "field16");
-        restoreForm();
-        expectPopup();
-        doKey("down");
-        break;
-
-    case 410:
-        checkMenuEntries(["2016-W32"]);
-        doKey("down");
-        doKey("return");
-        checkForm("2016-W32");
-
-        input = $_(20, "field17");
-        restoreForm();
-        expectPopup();
-        doKey("down");
-        break;
-
-    case 411:
-        checkMenuEntries(["2016-10-21T10:10"]);
-        doKey("down");
-        doKey("return");
-        checkForm("2016-10-21T10:10");
-
-        addEntry("field1", "value1");
-        break;
-
-    case 412:
-        input = $_(1, "field1");
-        // Go to test 500.
-        testNum = 499;
-
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    // Check that the input event is fired.
-    case 500:
-      input.addEventListener("input", function(event) {
-        input.removeEventListener("input", arguments.callee, false);
-        ok(true, testNum + " oninput should have been received");
-        ok(event.bubbles, testNum + " input event should bubble");
-        ok(event.cancelable, testNum + " input event should be cancelable");
-      }, false);
-
-      doKey("down");
-      checkForm("");
-      doKey("return");
-      checkForm("value1");
-      testNum = 599;
-      setTimeout(runTest, 100);
-      break;
-
-    case 600:
-        // check we don't show autocomplete for searchbar-history
-        input = $_(13, "searchbar-history");
-
-        // Trigger autocomplete popup
-        checkForm("");
-        restoreForm();
-        doKey("down");
-        waitForMenuChange(0);
-        break;
-
-    case 601:
-        checkMenuEntries([], testNum);
-        input.blur();
-        SimpleTest.finish();
-        return;
-
-    default:
-        ok(false, "Unexpected invocation of test #" + testNum);
-        SimpleTest.finish();
-        return;
-  }
-}
-
-function addEntry(name, value)
-{
-  updateFormHistory({ op : "add", fieldname : name, value: value }, runTest);
-}
-
-// Runs the next test when scroll event occurs
-function waitForScroll()
-{
-  addEventListener("scroll", function() {
-    if (!window.pageYOffset)
-      return;
-
-    removeEventListener("scroll", arguments.callee, false);
-    setTimeout(runTest, 100);
-  }, false);
-}
-
-function waitForMenuChange(expectedCount, expectedFirstValue)
-{
-    notifyMenuChanged(expectedCount, expectedFirstValue, runTest);
-}
-
-function checkMenuEntries(expectedValues, testNumber) {
-    var actualValues = getMenuEntries();
-    is(actualValues.length, expectedValues.length, testNumber + " Checking length of expected menu");
-    for (var i = 0; i < expectedValues.length; i++)
-        is(actualValues[i], expectedValues[i], testNumber + " Checking menu entry #"+i);
-}
-
-function startTest() {
-    setupFormHistory(function() {
-        runTest();
-    });
-}
-
-window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
-SimpleTest.requestFlakyTimeout("untriaged");
-</script>
-</pre>
-</body>
-</html>
-
diff --git a/toolkit/components/satchel/test/test_form_autocomplete_with_list.html b/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
deleted file mode 100644
index 04fb080c9..000000000
--- a/toolkit/components/satchel/test/test_form_autocomplete_with_list.html
+++ /dev/null
@@ -1,506 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for Form History Autocomplete</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-Form History test: form field autocomplete
-<p id="display"></p>
-
-<!-- we presumably can't hide the content for this test. -->
-<div id="content">
-
-  <!-- normal, basic form -->
-  <form id="form1" onsubmit="return false;">
-    <input list="suggest" type="text" name="field1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with autocomplete=off on input -->
-  <form id="form3" onsubmit="return false;">
-    <input list="suggest" type="text" name="field2" autocomplete="off">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form with autocomplete=off on form -->
-  <form id="form4" autocomplete="off" onsubmit="return false;">
-    <input list="suggest" type="text" name="field2">
-    <button type="submit">Submit</button>
-  </form>
-
-  <datalist id="suggest">
-    <option value="Google" label="PASS1">FAIL</option>
-    <option value="Reddit">PASS2</option>
-    <option value="final"></option>
-  </datalist>
-</div>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Form History autocomplete **/
-
-var input = $_(1, "field1");
-const shiftModifier = Components.interfaces.nsIDOMEvent.SHIFT_MASK;
-
-function setupFormHistory(aCallback) {
-  updateFormHistory([
-    { op : "remove" },
-    { op : "add", fieldname : "field1", value : "historyvalue" },
-    { op : "add", fieldname : "field2", value : "othervalue" },
-  ], aCallback);
-}
-
-function setForm(value) {
-    input.value = value;
-    input.focus();
-}
-
-// Restore the form to the default state.
-function restoreForm() {
-    setForm("");
-}
-
-// Check for expected form data.
-function checkForm(expectedValue) {
-    var formID = input.parentNode.id;
-    is(input.value, expectedValue, "Checking " + formID + " input");
-}
-
-var testNum = 0;
-var prevValue;
-var expectingPopup = false;
-
-function expectPopup() {
-  info("expecting popup for test " + testNum);
-  expectingPopup = true;
-}
-
-function popupShownListener() {
-  info("popup shown for test " + testNum);
-  if (expectingPopup) {
-    expectingPopup = false;
-    SimpleTest.executeSoon(runTest);
-  }
-  else {
-    ok(false, "Autocomplete popup not expected during test " + testNum);
-  }
-}
-
-registerPopupShownListener(popupShownListener);
-
-/*
-* Main section of test...
-*
-* This is a bit hacky, as many operations happen asynchronously.
-* Various mechanisms call runTests as a result of operations:
-*   - set expectingPopup to true, and the next test will occur when the autocomplete popup is shown
-*   - call waitForMenuChange(x) to run the next test when the autocomplete popup to have x items in it
-*/
-function runTest() {
-    testNum++;
-
-    info("Starting test #" + testNum);
-
-    switch (testNum) {
-    case 1:
-        // Make sure initial form is empty.
-        checkForm("");
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-    case 2:
-        checkMenuEntries(["historyvalue", "PASS1", "PASS2", "final"], testNum);
-        // Check first entry
-        doKey("down");
-        checkForm(""); // value shouldn't update
-        doKey("return"); // not "enter"!
-        checkForm("historyvalue");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 3:
-        // Check second entry
-        doKey("down");
-        doKey("down");
-        doKey("return"); // not "enter"!
-        checkForm("Google");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 4:
-        // Check third entry
-        doKey("down");
-        doKey("down");
-        doKey("down");
-        doKey("return");
-        checkForm("Reddit");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 5:
-        // Check fourth entry
-        doKey("down");
-        doKey("down");
-        doKey("down");
-        doKey("down");
-        doKey("return");
-        checkForm("final");
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 6:
-        // Delete the first entry (of 3)
-        doKey("down");
-        doKey("delete", shiftModifier);
-        waitForMenuChange(3);
-        break;
-
-    case 7:
-        checkForm("");
-        countEntries("field1", "historyvalue",
-          function (num) {
-            ok(!num, testNum + " checking that form history value was deleted");
-            runTest();
-          });
-        break;
-
-    case 8:
-        doKey("return");
-        checkForm("Google")
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 9:
-        // Test deletion
-        checkMenuEntries(["PASS1", "PASS2", "final"], testNum);
-        // Check the new first entry (of 3)
-        doKey("down");
-        doKey("return");
-        checkForm("Google");
-
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 10:
-        // Test autocompletion of datalists with cached results.
-        sendString("PAS");
-        waitForMenuChange(2);
-        break;
-
-    case 11:
-        // Continuation of test 10
-        sendString("S1");
-        waitForMenuChange(1);
-        break;
-
-    case 12:
-        doKey("down");
-        doKey("return");
-        checkForm("Google");
-
-        // Trigger autocomplete popup
-        // Look at form 3, try to trigger autocomplete popup
-        input.value = "";
-        input = $_(3, "field2");
-        testNum = 99;
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 100:
-        checkMenuEntries(["PASS1", "PASS2", "final"], testNum);
-        // Check first entry
-        doKey("down");
-        checkForm(""); // value shouldn't update
-        doKey("return"); // not "enter"!
-        checkForm("Google");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 101:
-        // Check second entry
-        doKey("down");
-        doKey("down");
-        doKey("return"); // not "enter"!
-        checkForm("Reddit");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 102:
-        // Check third entry
-        doKey("down");
-        doKey("down");
-        doKey("down");
-        doKey("return");
-        checkForm("final");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 103:
-        checkMenuEntries(["PASS1", "PASS2", "final"], testNum);
-        // Check first entry
-        doKey("down");
-        checkForm(""); // value shouldn't update
-        doKey("return"); // not "enter"!
-        checkForm("Google");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 104:
-        // Check second entry
-        doKey("down");
-        doKey("down");
-        doKey("return"); // not "enter"!
-        checkForm("Reddit");
-
-        // Trigger autocomplete popup
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    case 105:
-        // Check third entry
-        doKey("down");
-        doKey("down");
-        doKey("down");
-        doKey("return");
-        checkForm("final");
-
-        testNum = 199;
-        expectPopup();
-        restoreForm();
-        doKey("down");
-        break;
-
-    // Test dynamic updates.
-    // For some reasons, when there is an update of the list, the selection is
-    // lost so we need to go down like if we were at the beginning of the list
-    // again.
-    case 200:
-      // Removing the second element while on the first then going down and
-      // push enter. Value should be one from the third suggesion.
-      doKey("down");
-      var datalist = document.getElementById('suggest');
-      var toRemove = datalist.children[1]
-      datalist.removeChild(toRemove);
-
-      SimpleTest.executeSoon(function() {
-        doKey("down");
-        doKey("down");
-        doKey("return");
-        checkForm("final");
-
-        // Restore the element.
-        datalist.insertBefore(toRemove, datalist.children[1]);
-        expectPopup();
-        restoreForm();
-        doKey("down");
-      });
-      break;
-
-    case 201:
-      // Adding an attribute after the first one while on the first then going
-      // down and push enter. Value should be the on from the new suggestion.
-      doKey("down");
-      datalist = document.getElementById('suggest');
-      var added = new Option("Foo");
-      datalist.insertBefore(added, datalist.children[1]);
-      waitForMenuChange(4);
-      break;
-
-    case 202:
-      doKey("down");
-      doKey("down");
-      doKey("return");
-      checkForm("Foo");
-
-      // Remove the element.
-      datalist = document.getElementById('suggest');
-      datalist.removeChild(datalist.children[1]);
-      waitForMenuChange(0);
-      break;
-
-    case 203:
-      // Change the first element value attribute.
-      restoreForm();
-      datalist = document.getElementById('suggest');
-      prevValue = datalist.children[0].value;
-      datalist.children[0].value = "foo";
-      expectPopup();
-      break;
-
-    case 204:
-      doKey("down");
-      doKey("return");
-      checkForm("foo");
-
-      datalist = document.getElementById('suggest');
-      datalist.children[0].value = prevValue;
-      waitForMenuChange(0);
-      break;
-
-    case 205:
-      // Change the textContent to update the value attribute.
-      restoreForm();
-      datalist = document.getElementById('suggest');
-      prevValue = datalist.children[0].getAttribute('value');
-      datalist.children[0].removeAttribute('value');
-      datalist.children[0].textContent = "foobar";
-      expectPopup();
-      break;
-
-    case 206:
-      doKey("down");
-      doKey("return");
-      checkForm("foobar");
-
-      datalist = document.getElementById('suggest');
-      datalist.children[0].setAttribute('value', prevValue);
-      testNum = 299;
-      waitForMenuChange(0);
-      break;
-
-    // Tests for filtering (or not).
-    case 300:
-      // Filters with first letter of the word.
-      restoreForm();
-      synthesizeKey("f", {});
-      expectPopup();
-      break;
-
-    case 301:
-      doKey("down");
-      doKey("return");
-      checkForm("final");
-      expectPopup();
-      restoreForm();
-      doKey("down");
-      break;
-
-    case 302:
-      // Filter with a letter in the middle of the word.
-      synthesizeKey("i", {});
-      synthesizeKey("n", {});
-      waitForMenuChange(1);
-      break;
-
-    case 303:
-      // Continuation of test 302.
-      doKey("down");
-      doKey("return");
-      checkForm("final");
-      expectPopup();
-      restoreForm();
-      doKey("down");
-      break;
-
-    case 304:
-      // Filter is disabled with mozNoFilter.
-      input.setAttribute('mozNoFilter', 'true');
-      synthesizeKey("f", {});
-      waitForMenuChange(3); // no change
-      break;
-
-    case 305:
-      // Continuation of test 304.
-      doKey("down");
-      doKey("return");
-      checkForm("Google");
-      input.removeAttribute('mozNoFilter');
-      testNum = 399;
-      expectPopup();
-      restoreForm();
-      doKey("down");
-      break;
-
-    case 400:
-      // Check that the input event is fired.
-      input.addEventListener("input", function(event) {
-        input.removeEventListener("input", arguments.callee, false);
-        ok(true, "oninput should have been received");
-        ok(event.bubbles, "input event should bubble");
-        ok(event.cancelable, "input event should be cancelable");
-        checkForm("Google");
-        input.blur();
-        SimpleTest.finish();
-      }, false);
-
-      doKey("down");
-      checkForm("");
-      doKey("return");
-      break;
-
-    default:
-      ok(false, "Unexpected invocation of test #" + testNum);
-      SimpleTest.finish();
-      return;
-    }
-}
-
-function waitForMenuChange(expectedCount) {
-    notifyMenuChanged(expectedCount, null, runTest);
-}
-
-function checkMenuEntries(expectedValues, testNumber) {
-    var actualValues = getMenuEntries();
-    is(actualValues.length, expectedValues.length, testNumber + " Checking length of expected menu");
-    for (var i = 0; i < expectedValues.length; i++)
-        is(actualValues[i], expectedValues[i], testNumber + " Checking menu entry #"+i);
-}
-
-function startTest() {
-    setupFormHistory(runTest);
-}
-
-window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/test_form_submission.html b/toolkit/components/satchel/test/test_form_submission.html
deleted file mode 100644
index ecccabcaf..000000000
--- a/toolkit/components/satchel/test/test_form_submission.html
+++ /dev/null
@@ -1,537 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Satchel Test for Form Submisstion</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>  
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<p id="display"></p>
-<iframe id="iframe" src="https://example.com/tests/toolkit/components/satchel/test/subtst_form_submission_1.html"></iframe>
-<div id="content" style="display: none">
-  
-  <!-- ===== Things that should not be saved. ===== -->
-
-  <!-- autocomplete=off for input -->
-  <form id="form1" onsubmit="return checkSubmit(1)">
-    <input type="text" name="test1" autocomplete="off">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- autocomplete=off for form -->
-  <form id="form2" onsubmit="return checkSubmit(2)" autocomplete="off">
-    <input type="text" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- don't save type=hidden -->
-  <form id="form3" onsubmit="return checkSubmit(3)">
-    <input type="hidden" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- don't save type=checkbox -->
-  <form id="form4" onsubmit="return checkSubmit(4)">
-    <input type="checkbox" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- Don't save empty values. -->
-  <form id="form5" onsubmit="return checkSubmit(5)">
-    <input type="text" name="test1" value="originalValue">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- Don't save unchanged values. -->
-  <form id="form6" onsubmit="return checkSubmit(6)">
-    <input type="text" name="test1" value="dontSaveThis">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- Don't save unchanged values. (.value not touched) -->
-  <form id="form7" onsubmit="return checkSubmit(7)">
-    <input type="text" name="test1" value="dontSaveThis">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- No field name or ID. -->
-  <form id="form8" onsubmit="return checkSubmit(8)">
-    <input type="text">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- Nothing to save! -->
-  <form id="form9" onsubmit="return checkSubmit(9)">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with name too long (300 chars.) -->
-  <form id="form10" onsubmit="return checkSubmit(10)">
-    <input type="text" name="12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with value too long (300 chars.) -->
-  <form id="form11" onsubmit="return checkSubmit(11)">
-    <input type="text" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with value of one space (which should be trimmed) -->
-  <form id="form12" onsubmit="return checkSubmit(12)">
-    <input type="text" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- password field -->
-  <form id="form13" onsubmit="return checkSubmit(13)">
-    <input type="password" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- password field (type changed after pageload) -->
-  <form id="form14" onsubmit="return checkSubmit(14)">
-    <input type="text" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with sensitive data (16 digit credit card number) -->
-  <form id="form15" onsubmit="return checkSubmit(15)">
-    <script type="text/javascript">
-      var form = document.getElementById('form15');
-      for (let i = 0; i != 10; i++)
-      {
-        let input = document.createElement('input');
-        input.type = 'text';
-        input.name = 'test' + (i + 1);
-        form.appendChild(input);
-      }
-    </script>
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with sensitive data (15 digit credit card number) -->
-  <form id="form16" onsubmit="return checkSubmit(16)">
-    <script type="text/javascript">
-      form = document.getElementById('form16');
-      for (let i = 0; i != 10; i++)
-      {
-        let input = document.createElement('input');
-        input.type = 'text';
-        input.name = 'test' + (i + 1);
-        form.appendChild(input);
-      }
-    </script>
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with sensitive data (9 digit credit card number) -->
-  <form id="form17" onsubmit="return checkSubmit(17)">
-    <input type="text" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with sensitive data (16 digit hyphenated credit card number) -->
-  <form id="form18" onsubmit="return checkSubmit(18)">
-    <input type="text" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with sensitive data (15 digit whitespace-separated credit card number) -->
-  <form id="form19" onsubmit="return checkSubmit(19)">
-    <input type="text" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form data submitted through HTTPS, when browser.formfill.saveHttpsForms is false -->
-  <form id="form20" action="https://www.example.com/" onsubmit="return checkSubmit(20)">
-    <input type="text" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- Form 21 is submitted into an iframe, not declared here. -->
-
-  <!-- Don't save values if the form is invalid. -->
-  <form id="form22" onsubmit="return checkSubmit(22);">
-    <input type='email' name='test1' oninvalid="return checkSubmit(22);">
-    <button type='submit'>Submit</button>
-  </form>
-
-  <!-- Don't save values if the form is invalid. -->
-  <form id="form23" onsubmit="return checkSubmit(23);">
-    <input type='email' value='foo' oninvalid="return checkSubmit(23);">
-    <input type='text' name='test1'>
-    <button type='submit'>Submit</button>
-  </form>
-
-  <!-- Don't save values if the input name is 'searchbar-history' -->
-  <form id="form24" onsubmit="return checkSubmit(24);">
-    <input type='text' name='searchbar-history'>
-    <button type='submit'>Submit</button>
-  </form>
-
-  <!-- ===== Things that should be saved ===== -->
-
-  <!-- Form 100 is submitted into an iframe, not declared here. -->
-
-  <!-- input with no default value -->
-  <form id="form101" onsubmit="return checkSubmit(101)">
-    <input type="text" name="test1">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with a default value -->
-  <form id="form102" onsubmit="return checkSubmit(102)">
-    <input type="text" name="test2" value="originalValue">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input uses id but not name -->
-  <form id="form103" onsubmit="return checkSubmit(103)">
-    <input type="text" id="test3">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with leading and trailing space -->
-  <form id="form104" onsubmit="return checkSubmit(104)">
-    <input type="text" name="test4">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input with leading and trailing whitespace -->
-  <form id="form105" onsubmit="return checkSubmit(105)">
-    <input type="text" name="test5">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input that looks like sensitive data but doesn't
-       satisfy the requirements (incorrect length) -->
-  <form id="form106" onsubmit="return checkSubmit(106)">
-    <input type="text" name="test6">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input that looks like sensitive data but doesn't
-       satisfy the requirements (Luhn check fails for 16 chars) -->
-  <form id="form107" onsubmit="return checkSubmit(107)">
-    <script type="text/javascript">
-      form = document.getElementById('form107');
-      for (let i = 0; i != 10; i++)
-      {
-        let input = document.createElement('input');
-        input.type = 'text';
-        input.name = 'test7_' + (i + 1);
-        form.appendChild(input);
-      }
-    </script>
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- input that looks like sensitive data but doesn't
-       satisfy the requirements (Luhn check fails for 15 chars) -->
-  <form id="form108" onsubmit="return checkSubmit(108)">
-    <script type="text/javascript">
-      form = document.getElementById('form108');
-      for (let i = 0; i != 10; i++)
-      {
-        let input = document.createElement('input');
-        input.type = 'text';
-        input.name = 'test8_' + (i + 1);
-        form.appendChild(input);
-      }
-    </script>
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- form data submitted through HTTPS, when browser.formfill.saveHttpsForms is true -->
-  <form id="form109" action="https://www.example.com/" onsubmit="return checkSubmit(109)">
-    <input type="text" name="test9">
-    <button type="submit">Submit</button>
-  </form>
-
-  <!-- regular form data, when browser.formfill.saveHttpsForms is false -->
-  <form id="form110" onsubmit="return checkSubmit(110)">
-    <input type="text" name="test10">
-    <button type="submit">Submit</button>
-  </form>
-
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-var numSubmittedForms = 0;
-
-var ccNumbers = {
-  valid15: [
-    "930771457288760", "474915027480942",
-    "924894781317325", "714816113937185",
-    "790466087343106", "474320195408363",
-    "219211148122351", "633038472250799",
-    "354236732906484", "095347810189325",
-  ],
-  valid16: [
-    "3091269135815020", "5471839082338112",
-    "0580828863575793", "5015290610002932",
-    "9465714503078607", "4302068493801686",
-    "2721398408985465", "6160334316984331",
-    "8643619970075142", "0218246069710785"
-  ],
-  invalid15: [
-    "526931005800649", "724952425140686",
-    "379761391174135", "030551436468583",
-    "947377014076746", "254848023655752",
-    "226871580283345", "708025346034339",
-    "917585839076788", "918632588027666"
-  ],
-  invalid16: [
-    "9946177098017064", "4081194386488872",
-    "3095975979578034", "3662215692222536",
-    "6723210018630429", "4411962856225025",
-    "8276996369036686", "4449796938248871",
-    "3350852696538147", "5011802870046957"
-  ],
-};
-
-function checkInitialState() {
-  countEntries(null, null,
-    function (num) {
-      ok(!num, "checking for initially empty storage");
-      startTest();
-    });
-}
-
-function startTest() {
-  // Fill in values for the various fields. We could just set the <input>'s
-  // value attribute, but we don't save default form values (and we want to
-  // ensure unsaved values are because of autocomplete=off or whatever).
-  $_(1, "test1").value = "dontSaveThis";
-  $_(2, "test1").value = "dontSaveThis";
-  $_(3, "test1").value = "dontSaveThis";
-  $_(4, "test1").value = "dontSaveThis";
-  $_(5, "test1").value = "";
-  $_(6, "test1").value = "dontSaveThis";
-  // Form 7 deliberately left untouched.
-  // Form 8 has an input with no name or input attribute.
-  let input = document.getElementById("form8").elements[0];
-  is(input.type, "text", "checking we got unidentified input");
-  input.value = "dontSaveThis";
-  // Form 9 has nothing to modify.
-  $_(10, "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890").value = "dontSaveThis";
-  $_(11, "test1").value = "12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
-  $_(12, "test1").value = " ";
-  $_(13, "test1").value = "dontSaveThis";
-  $_(14, "test1").type  = "password";
-  $_(14, "test1").value = "dontSaveThis";
-
-  var testData = ccNumbers.valid16;
-  for (let i = 0; i != testData.length; i++) {
-    $_(15, "test" + (i + 1)).value = testData[i];
-  }
-
-  testData = ccNumbers.valid15;
-  for (let i = 0; i != testData.length; i++) {
-    $_(16, "test" + (i + 1)).value = testData[i];
-  }
-  $_(17, "test1").value = "001064088";
-  $_(18, "test1").value = "0000-0000-0080-4609";
-  $_(19, "test1").value = "0000 0000 0222 331";
-  $_(20, "test1").value = "dontSaveThis";
-  $_(22, "test1").value = "dontSaveThis";
-  $_(23, "test1").value = "dontSaveThis";
-  $_(24, "searchbar-history").value = "dontSaveThis";
-
-  $_(101, "test1").value = "savedValue";
-  $_(102, "test2").value = "savedValue";
-  $_(103, "test3").value = "savedValue";
-  $_(104, "test4").value = " trimTrailingAndLeadingSpace ";
-  $_(105, "test5").value = "\t trimTrailingAndLeadingWhitespace\t ";
-  $_(106, "test6").value = "00000000109181";
-
-  testData = ccNumbers.invalid16;
-  for (let i = 0; i != testData.length; i++) {
-    $_(107, "test7_" + (i + 1)).value = testData[i];
-  }
-
-  testData = ccNumbers.invalid15;
-  for (let i = 0; i != testData.length; i++) {
-    $_(108, "test8_" + (i + 1)).value = testData[i];
-  }
-
-  $_(109, "test9").value = "savedValue";
-  $_(110, "test10").value = "savedValue";
-
-  // submit the first form.
-  var button = getFormSubmitButton(1);
-  button.click();
-}
-
-
-// Called by each form's onsubmit handler.
-function checkSubmit(formNum) {
-  netscape.security.PrivilegeManager.enablePrivilege('UniversalXPConnect');
-
-  ok(true, "form " + formNum + " submitted");
-  numSubmittedForms++;
-
-  // Check for expected storage state.
-  switch (formNum) {
-    // Test 1-24 should not save anything.
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-    case 16:
-    case 17:
-    case 18:
-    case 19:
-    case 20:
-    case 21:
-    case 22:
-    case 23:
-    case 24:
-      countEntries(null, null,
-        function (num) {
-          ok(!num, "checking for empty storage");
-          submitForm(formNum);
-        });
-        return false;
-    case 100:
-        checkForSave("subtest2", "subtestValue", "checking saved subtest value");
-        break;
-    case 101:
-        checkForSave("test1", "savedValue", "checking saved value");
-        break;
-    case 102:
-        checkForSave("test2", "savedValue", "checking saved value");
-        break;
-    case 103:
-        checkForSave("test3", "savedValue", "checking saved value");
-        break;
-    case 104:
-        checkForSave("test4", "trimTrailingAndLeadingSpace", "checking saved value is trimmed on both sides");
-        break;
-    case 105:
-        checkForSave("test5", "trimTrailingAndLeadingWhitespace", "checking saved value is trimmed on both sides");
-        break;
-    case 106:
-        checkForSave("test6", "00000000109181", "checking saved value");
-        break;
-    case 107:
-        for (let i = 0; i != ccNumbers.invalid16.length; i++) {
-          checkForSave("test7_" + (i + 1), ccNumbers.invalid16[i], "checking saved value");
-        }
-        break;
-    case 108:
-        for (let i = 0; i != ccNumbers.invalid15.length; i++) {
-          checkForSave("test8_" + (i + 1), ccNumbers.invalid15[i], "checking saved value");
-        }
-        break;
-    case 109:
-        checkForSave("test9", "savedValue", "checking saved value");
-        break;
-    case 110:
-        checkForSave("test10", "savedValue", "checking saved value");
-        break;
-    default:
-        ok(false, "Unexpected form submission");
-        break;
-  }
-
-  return submitForm(formNum);
-}
-
-function submitForm(formNum)
-{
-  // Forms 13 and 14 would trigger a save-password notification. Temporarily
-  // disable pwmgr, then reenable it.
-  if (formNum == 12)
-      SpecialPowers.setBoolPref("signon.rememberSignons", false);
-  if (formNum == 14)
-      SpecialPowers.clearUserPref("signon.rememberSignons");
-
-  // Forms 20 and 21 requires browser.formfill.saveHttpsForms to be false
-  if (formNum == 19)
-    SpecialPowers.setBoolPref("browser.formfill.saveHttpsForms", false);
-  // Reset preference now that 20 and 21 are over
-  if (formNum == 21)
-    SpecialPowers.clearUserPref("browser.formfill.saveHttpsForms");
-
-  // End the test now on SeaMonkey.
-  if (formNum == 21 && navigator.userAgent.match(/ SeaMonkey\//)) {
-    checkObserver.uninit();
-    is(numSubmittedForms, 21, "Ensuring all forms were submitted.");
-
-    todo(false, "Skipping remaining checks on SeaMonkey ftb. (Bug 589471)");
-    // finish(), yet let the test actually end first, to be safe.
-    SimpleTest.executeSoon(SimpleTest.finish);
-
-    return false; // return false to cancel current form submission
-  }
-
-  // Form 109 requires browser.formfill.save_https_forms to be true;
-  // Form 110 requires it to be false.
-  if (formNum == 108)
-    SpecialPowers.setBoolPref("browser.formfill.saveHttpsForms", true);
-  if (formNum == 109)
-    SpecialPowers.setBoolPref("browser.formfill.saveHttpsForms", false);
-  if (formNum == 110)
-    SpecialPowers.clearUserPref("browser.formfill.saveHttpsForms");
-
-  // End the test at the last form.
-  if (formNum == 110) {
-    is(numSubmittedForms, 35, "Ensuring all forms were submitted.");
-    checkObserver.uninit();
-    SimpleTest.finish();
-    return false; // return false to cancel current form submission
-  }
-
-  // This timeout is here so that button.click() is never called before this
-  // function returns. If button.click() is called before returning, a long
-  // chain of submits will happen recursively since the submit is dispatched
-  // immediately.
-  //
-  // This in itself is fine, but if there are errors in the code, mochitests
-  // will in some cases give you "server too busy", which is hard to debug!
-  //
-  setTimeout(function() {
-    checkObserver.waitForChecks(function() {
-      var nextFormNum = formNum == 24 ? 100 : (formNum + 1);
-
-      // Submit the next form. Special cases are Forms 21 and 100, which happen
-      // from an HTTPS domain in an iframe.
-      if (nextFormNum == 21 || nextFormNum == 100) {
-        ok(true, "submitting iframe test " + nextFormNum);
-        document.getElementById("iframe").contentWindow.clickButton(nextFormNum);
-      }
-      else {
-        var button = getFormSubmitButton(nextFormNum);
-        button.click();
-      }
-    });
-  }, 0);
-
-  return false; // cancel current form submission
-}
-
-checkObserver.init();
-
-window.onload = checkInitialState;
-
-SimpleTest.waitForExplicitFinish();
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/test_form_submission_cap.html b/toolkit/components/satchel/test/test_form_submission_cap.html
deleted file mode 100644
index 96112f1c1..000000000
--- a/toolkit/components/satchel/test/test_form_submission_cap.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Satchel Test for Form Submisstion Field Cap</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-  <form id="form1" onsubmit="return checkSubmit(1)">
-    <button type="submit">Submit</button>
-  </form>
-
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/* Test for bug 492701.
-   Save only the first MAX_FIELDS_SAVED changed fields in a form.
-   Generate numInputFields = MAX_FIELDS_SAVED + 1 fields, change all values,
-   and test that only MAX_FIELDS_SAVED are actually saved and that
-   field # numInputFields was not saved.
-*/
-
-var numSubmittedForms = 0;
-var numInputFields = 101;
-
-function checkInitialState() {
-  countEntries(null, null,
-    function (num) {
-      ok(!num, "checking for initially empty storage");
-      startTest();
-    });
-}
-
-function startTest() {
-  var form = document.getElementById("form1");
-  for (i = 1; i <= numInputFields; i++) {
-    var newField = document.createElement("input");
-    newField.setAttribute("type", "text");
-    newField.setAttribute("name", "test" + i);
-    form.appendChild(newField);
-  }
-
-  // Fill in values for the various fields. We could just set the <input>'s
-  // value attribute, but we don't save default form values (and we want to
-  // ensure unsaved values are because of autocomplete=off or whatever).
-  for (i = 1; i <= numInputFields; i++) {
-    $_(1, "test" + i).value = i;
-  }
-
-  // submit the first form.
-  var button = getFormSubmitButton(1);
-  button.click();
-}
-
-
-// Called by each form's onsubmit handler.
-function checkSubmit(formNum) {
-  ok(true, "form " + formNum + " submitted");
-  numSubmittedForms++;
-
-  // check that the first (numInputFields - 1) CHANGED fields are saved
-  for (i = 1; i < numInputFields; i++) { // check all but last
-    checkForSave("test" + i, i, "checking saved value " + i);
-  }
-
-  // End the test.
-  is(numSubmittedForms, 1, "Ensuring all forms were submitted.");
-  SimpleTest.finish();
-  return false; // return false to cancel current form submission
-}
-
-
-window.onload = checkInitialState;
-
-SimpleTest.waitForExplicitFinish();
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/test_form_submission_cap2.html b/toolkit/components/satchel/test/test_form_submission_cap2.html
deleted file mode 100644
index f51fb5f47..000000000
--- a/toolkit/components/satchel/test/test_form_submission_cap2.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Satchel Test for Form Submisstion Field Cap</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<p id="display"></p>
-<div id="content" style="display: none">
-<!--
-   Test for bug 492701.
-   Only change field # numInputFields (= MAX_FIELDS_SAVED + 1)
-   and test that it is actually saved and the other (unmodified) ones are not.
--->
-  <form id="form1" onsubmit="return checkSubmit(1)">
-    <input type="text" name="test1" value="1">
-    <input type="text" name="test2" value="2">
-    <input type="text" name="test3" value="3">
-    <input type="text" name="test4" value="4">
-    <input type="text" name="test5" value="5">
-    <input type="text" name="test6" value="6">
-    <input type="text" name="test7" value="7">
-    <input type="text" name="test8" value="8">
-    <input type="text" name="test9" value="9">
-    <input type="text" name="test10" value="10">
-    <input type="text" name="test11" value="11">
-    <input type="text" name="test12" value="12">
-    <input type="text" name="test13" value="13">
-    <input type="text" name="test14" value="14">
-    <input type="text" name="test15" value="15">
-    <input type="text" name="test16" value="16">
-    <input type="text" name="test17" value="17">
-    <input type="text" name="test18" value="18">
-    <input type="text" name="test19" value="19">
-    <input type="text" name="test20" value="20">
-    <input type="text" name="test21" value="21">
-    <input type="text" name="test22" value="22">
-    <input type="text" name="test23" value="23">
-    <input type="text" name="test24" value="24">
-    <input type="text" name="test25" value="25">
-    <input type="text" name="test26" value="26">
-    <input type="text" name="test27" value="27">
-    <input type="text" name="test28" value="28">
-    <input type="text" name="test29" value="29">
-    <input type="text" name="test30" value="30">
-    <input type="text" name="test31" value="31">
-    <input type="text" name="test32" value="32">
-    <input type="text" name="test33" value="33">
-    <input type="text" name="test34" value="34">
-    <input type="text" name="test35" value="35">
-    <input type="text" name="test36" value="36">
-    <input type="text" name="test37" value="37">
-    <input type="text" name="test38" value="38">
-    <input type="text" name="test39" value="39">
-    <input type="text" name="test40" value="40">
-    <input type="text" name="test41" value="41">
-    <input type="text" name="test42" value="42">
-    <input type="text" name="test43" value="43">
-    <input type="text" name="test44" value="44">
-    <input type="text" name="test45" value="45">
-    <input type="text" name="test46" value="46">
-    <input type="text" name="test47" value="47">
-    <input type="text" name="test48" value="48">
-    <input type="text" name="test49" value="49">
-    <input type="text" name="test50" value="50">
-    <input type="text" name="test51" value="51">
-    <input type="text" name="test52" value="52">
-    <input type="text" name="test53" value="53">
-    <input type="text" name="test54" value="54">
-    <input type="text" name="test55" value="55">
-    <input type="text" name="test56" value="56">
-    <input type="text" name="test57" value="57">
-    <input type="text" name="test58" value="58">
-    <input type="text" name="test59" value="59">
-    <input type="text" name="test60" value="60">
-    <input type="text" name="test61" value="61">
-    <input type="text" name="test62" value="62">
-    <input type="text" name="test63" value="63">
-    <input type="text" name="test64" value="64">
-    <input type="text" name="test65" value="65">
-    <input type="text" name="test66" value="66">
-    <input type="text" name="test67" value="67">
-    <input type="text" name="test68" value="68">
-    <input type="text" name="test69" value="69">
-    <input type="text" name="test70" value="70">
-    <input type="text" name="test71" value="71">
-    <input type="text" name="test72" value="72">
-    <input type="text" name="test73" value="73">
-    <input type="text" name="test74" value="74">
-    <input type="text" name="test75" value="75">
-    <input type="text" name="test76" value="76">
-    <input type="text" name="test77" value="77">
-    <input type="text" name="test78" value="78">
-    <input type="text" name="test79" value="79">
-    <input type="text" name="test80" value="80">
-    <input type="text" name="test81" value="81">
-    <input type="text" name="test82" value="82">
-    <input type="text" name="test83" value="83">
-    <input type="text" name="test84" value="84">
-    <input type="text" name="test85" value="85">
-    <input type="text" name="test86" value="86">
-    <input type="text" name="test87" value="87">
-    <input type="text" name="test88" value="88">
-    <input type="text" name="test89" value="89">
-    <input type="text" name="test90" value="90">
-    <input type="text" name="test91" value="91">
-    <input type="text" name="test92" value="92">
-    <input type="text" name="test93" value="93">
-    <input type="text" name="test94" value="94">
-    <input type="text" name="test95" value="95">
-    <input type="text" name="test96" value="96">
-    <input type="text" name="test97" value="97">
-    <input type="text" name="test98" value="98">
-    <input type="text" name="test99" value="99">
-    <input type="text" name="test100" value="100">
-    <input type="text" name="test101" value="101">
-    <button type="submit">Submit</button>
-  </form>
-
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-var numSubmittedForms = 0;
-var numInputFields = 101;
-
-function checkInitialState() {
-  countEntries(null, null,
-    function (num) {
-      ok(!num, "checking for initially empty storage");
-      startTest();
-    });
-}
-
-function startTest() {
-  // Fill in values for the various fields. We could just set the <input>'s
-  // value attribute, but we don't save default form values (and we want to
-  // ensure unsaved values are because of autocomplete=off or whatever).
-  $_(1, "test" + numInputFields).value = numInputFields + " changed";
-
-  // submit the first form.
-  var button = getFormSubmitButton(1);
-  button.click();
-}
-
-// Make sure that the first (numInputFields - 1) were not saved (as they were not changed).
-// Call done() when finished.
-function checkCountEntries(formNum, index, done)
-{
-  countEntries("test" + index, index,
-    function (num) {
-      ok(!num, "checking unsaved value " + index);
-      if (index < numInputFields) {
-        checkCountEntries(formNum, index + 1, done);
-      }
-      else {
-        done(formNum);
-      }
-    });
-}
-
-// Called by each form's onsubmit handler.
-function checkSubmit(formNum) {
-  ok(true, "form " + formNum + " submitted");
-  numSubmittedForms++;
-
-  // make sure that the field # numInputFields was saved
-  checkForSave("test" + numInputFields, numInputFields + " changed", "checking saved value " + numInputFields);
-
-  checkCountEntries(formNum, 1, checkSubmitCounted);
-
-  return false; // cancel current form submission
-}
-
-function checkSubmitCounted(formNum) {
-  is(numSubmittedForms, 1, "Ensuring all forms were submitted.");
-  SimpleTest.finish();
-  return false;
-}
-
-window.onload = checkInitialState;
-
-SimpleTest.waitForExplicitFinish();
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/test_password_autocomplete.html b/toolkit/components/satchel/test/test_password_autocomplete.html
deleted file mode 100644
index 82781ae35..000000000
--- a/toolkit/components/satchel/test/test_password_autocomplete.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for form history on type=password</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-  Test for form history on type=password
-  (based on test_bug_511615.html)
-<p id="display"></p>
-
-<!-- we presumably can't hide the content for this test. -->
-<div id="content">
-  <datalist id="datalist1">
-    <option>value10</option>
-    <option>value11</option>
-    <option>value12</option>
-  </datalist>
-  <form id="form1" onsubmit="return false;">
-    <!-- Don't set the type to password until rememberSignons is false since we
-         want to test when rememberSignons is false. -->
-    <input  type="to-be-password" name="field1" list="datalist1">
-    <button type="submit">Submit</button>
-  </form>
-</div>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-/* import-globals-from satchel_common.js */
-
-var resolvePopupShownListener;
-registerPopupShownListener(() => resolvePopupShownListener());
-
-function waitForNextPopup() {
-  return new Promise(resolve => { resolvePopupShownListener = resolve; });
-}
-
-/**
- * Indicates the time to wait before checking that the state of the autocomplete
- * popup, including whether it is open, has not changed in response to events.
- *
- * Manual testing on a fast machine revealed that 80ms was still unreliable,
- * while 100ms detected a simulated failure reliably. Unfortunately, this means
- * that to take into account slower machines we should use a larger value.
- *
- * Note that if a machine takes more than this time to show the popup, this
- * would not cause a failure, conversely the machine would not be able to detect
- * whether the test should have failed. In other words, this use of timeouts is
- * never expected to cause intermittent failures with test automation.
- */
-const POPUP_RESPONSE_WAIT_TIME_MS = 200;
-
-SimpleTest.requestFlakyTimeout("Must ensure that an event does not happen.");
-
-/**
- * Checks that the popup does not open in response to the given function.
- */
-function expectPopupDoesNotOpen(triggerFn) {
-  let popupShown = waitForNextPopup();
-  triggerFn();
-  return Promise.race([
-    popupShown.then(() => Promise.reject("Popup opened unexpectedly.")),
-    new Promise(resolve => setTimeout(resolve, POPUP_RESPONSE_WAIT_TIME_MS)),
-  ]);
-}
-
-add_task(function* test_initialize() {
-  yield SpecialPowers.pushPrefEnv({"set": [["signon.rememberSignons", false]]});
-
-  // Now that rememberSignons is false, create the password field
-  $_(1, "field1").type = "password";
-
-  yield new Promise(resolve => updateFormHistory([
-    { op : "remove" },
-    { op : "add", fieldname : "field1", value : "value1" },
-    { op : "add", fieldname : "field1", value : "value2" },
-    { op : "add", fieldname : "field1", value : "value3" },
-    { op : "add", fieldname : "field1", value : "value4" },
-    { op : "add", fieldname : "field1", value : "value5" },
-    { op : "add", fieldname : "field1", value : "value6" },
-    { op : "add", fieldname : "field1", value : "value7" },
-    { op : "add", fieldname : "field1", value : "value8" },
-    { op : "add", fieldname : "field1", value : "value9" },
-  ], resolve));
-});
-
-add_task(function* test_insecure_focusWarning() {
-  // The form is insecure so should show the warning even if password manager is disabled.
-  let input = $_(1, "field1");
-  let shownPromise = waitForNextPopup();
-  input.focus();
-  yield shownPromise;
-
-  ok(getMenuEntries()[0].includes("Logins entered here could be compromised"),
-     "Check warning is first")
-
-  // Close the popup
-  input.blur();
-});
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/test_popup_direction.html b/toolkit/components/satchel/test/test_popup_direction.html
deleted file mode 100644
index 02e044bbd..000000000
--- a/toolkit/components/satchel/test/test_popup_direction.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Test for Popup Direction</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-Test for Popup Direction
-<p id="display"></p>
-
-<!-- we presumably can't hide the content for this test. -->
-<div id="content">
-  <!-- normal, basic form -->
-  <form id="form1" onsubmit="return false;">
-    <input  type="text" name="field1">
-    <button type="submit">Submit</button>
-  </form>
-</div>
-
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-var resolvePopupShownListener;
-registerPopupShownListener(() => resolvePopupShownListener());
-
-function waitForNextPopup() {
-  return new Promise(resolve => { resolvePopupShownListener = resolve; });
-}
-
-add_task(function* test_popup_direction() {
-  var input = $_(1, "field1");
-
-  yield new Promise(resolve => updateFormHistory([
-    { op : "remove" },
-    { op : "add", fieldname : "field1", value : "value1" },
-    { op : "add", fieldname : "field1", value : "value2" },
-  ], resolve));
-
-  for (let direction of ["ltr", "rtl"]) {
-    document.getElementById("content").style.direction = direction;
-
-    let popupShown = waitForNextPopup();
-    input.focus();
-    doKey("down");
-    yield popupShown;
-
-    let popupState = yield new Promise(resolve => getPopupState(resolve));
-    is(popupState.direction, direction, "Direction should match.");
-
-    // Close the popup.
-    input.blur();
-  }
-});
-
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/test_popup_enter_event.html b/toolkit/components/satchel/test/test_popup_enter_event.html
deleted file mode 100644
index 1a7aa8c19..000000000
--- a/toolkit/components/satchel/test/test_popup_enter_event.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>Test for events while the form history popup is open</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="text/javascript" src="satchel_common.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-Form History test: Test for events while the form history popup is open
-<p id="display"></p>
-
-<div id="content">
-  <form id="form1">
-    <input  type="text" name="field1">
-    <button type="submit">Submit</button>
-  </form>
-</div>
-
-<pre id="test">
-<script class="testbody">
-var form = document.getElementById("form1");
-var input = $_(1, "field1");
-var expectedValue = "value1";
-
-function setupFormHistory(aCallback) {
-  updateFormHistory([
-    { op : "remove" },
-    { op : "add", fieldname : "field1", value : "value1" },
-  ], aCallback);
-}
-
-registerPopupShownListener(popupShownListener);
-
-function handleEnter(evt) {
-  if (evt.keyCode != KeyEvent.DOM_VK_RETURN) {
-    return;
-  }
-
-  info("RETURN received for phase: " + evt.eventPhase);
-  if (input.value == expectedValue) {
-    ok(true, "RETURN should be received when the popup is closed");
-    is(input.value, expectedValue, "Check input value when enter is pressed the 2nd time");
-    info("form should submit with the default handler");
-  } else {
-    ok(false, "RETURN keypress shouldn't have been received when a popup item is selected");
-  }
-}
-
-function popupShownListener(evt) {
-  doKey("down");
-  doKey("return"); // select the first entry in the popup
-  doKey("return"); // try to submit the form with the filled value
-}
-
-function runTest() {
-  input.addEventListener("keypress", handleEnter, true);
-  form.addEventListener("submit", evt => {
-    is(input.value, expectedValue, "Check input value in the submit handler");
-    evt.preventDefault();
-    SimpleTest.finish();
-  });
-
-  // Focus the input before adjusting.value so that the caret goes to the end
-  // (since OS X doesn't show the dropdown otherwise).
-  input.focus();
-  input.value = "value"
-  input.focus();
-  doKey("down");
-}
-
-function startTest() {
-  setupFormHistory(function() {
-    runTest();
-  });
-}
-
-window.onload = startTest;
-
-SimpleTest.waitForExplicitFinish();
-</script>
-</pre>
-</body>
-</html>
diff --git a/toolkit/components/satchel/test/unit/.eslintrc.js b/toolkit/components/satchel/test/unit/.eslintrc.js
deleted file mode 100644
index d35787cd2..000000000
--- a/toolkit/components/satchel/test/unit/.eslintrc.js
+++ /dev/null
@@ -1,7 +0,0 @@
-"use strict";
-
-module.exports = {
-  "extends": [
-    "../../../../../testing/xpcshell/xpcshell.eslintrc.js"
-  ]
-};
diff --git a/toolkit/components/satchel/test/unit/asyncformhistory_expire.sqlite b/toolkit/components/satchel/test/unit/asyncformhistory_expire.sqlite
deleted file mode 100644
index 07b43c209..000000000
--- a/toolkit/components/satchel/test/unit/asyncformhistory_expire.sqlite
+++ /dev/null
diff --git a/toolkit/components/satchel/test/unit/formhistory_1000.sqlite b/toolkit/components/satchel/test/unit/formhistory_1000.sqlite
deleted file mode 100644
index 5eeab074f..000000000
--- a/toolkit/components/satchel/test/unit/formhistory_1000.sqlite
+++ /dev/null
diff --git a/toolkit/components/satchel/test/unit/formhistory_CORRUPT.sqlite b/toolkit/components/satchel/test/unit/formhistory_CORRUPT.sqlite
deleted file mode 100644
index 5f7498bfc..000000000
--- a/toolkit/components/satchel/test/unit/formhistory_CORRUPT.sqlite
+++ /dev/null
@@ -1 +0,0 @@
-BACON
diff --git a/toolkit/components/satchel/test/unit/formhistory_apitest.sqlite b/toolkit/components/satchel/test/unit/formhistory_apitest.sqlite
deleted file mode 100644
index 00daf03c2..000000000
--- a/toolkit/components/satchel/test/unit/formhistory_apitest.sqlite
+++ /dev/null
diff --git a/toolkit/components/satchel/test/unit/formhistory_autocomplete.sqlite b/toolkit/components/satchel/test/unit/formhistory_autocomplete.sqlite
deleted file mode 100644
index 724cff73f..000000000
--- a/toolkit/components/satchel/test/unit/formhistory_autocomplete.sqlite
+++ /dev/null
diff --git a/toolkit/components/satchel/test/unit/formhistory_v3.sqlite b/toolkit/components/satchel/test/unit/formhistory_v3.sqlite
deleted file mode 100644
index e0e8fe246..000000000
--- a/toolkit/components/satchel/test/unit/formhistory_v3.sqlite
+++ /dev/null
diff --git a/toolkit/components/satchel/test/unit/formhistory_v3v4.sqlite b/toolkit/components/satchel/test/unit/formhistory_v3v4.sqlite
deleted file mode 100644
index 8eab177e9..000000000
--- a/toolkit/components/satchel/test/unit/formhistory_v3v4.sqlite
+++ /dev/null
diff --git a/toolkit/components/satchel/test/unit/formhistory_v999a.sqlite b/toolkit/components/satchel/test/unit/formhistory_v999a.sqlite
deleted file mode 100644
index 14279f05f..000000000
--- a/toolkit/components/satchel/test/unit/formhistory_v999a.sqlite
+++ /dev/null
diff --git a/toolkit/components/satchel/test/unit/formhistory_v999b.sqlite b/toolkit/components/satchel/test/unit/formhistory_v999b.sqlite
deleted file mode 100644
index 21d9c1f1c..000000000
--- a/toolkit/components/satchel/test/unit/formhistory_v999b.sqlite
+++ /dev/null
diff --git a/toolkit/components/satchel/test/unit/head_satchel.js b/toolkit/components/satchel/test/unit/head_satchel.js
deleted file mode 100644
index 282d07ba5..000000000
--- a/toolkit/components/satchel/test/unit/head_satchel.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/* 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/. */
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
-Components.utils.import("resource://gre/modules/FormHistory.jsm");
-
-var Ci = Components.interfaces;
-var Cc = Components.classes;
-var Cu = Components.utils;
-
-const CURRENT_SCHEMA = 4;
-const PR_HOURS = 60 * 60 * 1000000;
-
-do_get_profile();
-
-var dirSvc = Cc["@mozilla.org/file/directory_service;1"].
-             getService(Ci.nsIProperties);
-
-// Send the profile-after-change notification to the form history component to ensure
-// that it has been initialized.
-var formHistoryStartup = Cc["@mozilla.org/satchel/form-history-startup;1"].
-                         getService(Ci.nsIObserver);
-formHistoryStartup.observe(null, "profile-after-change", null);
-
-function getDBVersion(dbfile) {
-    var ss = Cc["@mozilla.org/storage/service;1"].
-             getService(Ci.mozIStorageService);
-    var dbConnection = ss.openDatabase(dbfile);
-    var version = dbConnection.schemaVersion;
-    dbConnection.close();
-
-    return version;
-}
-
-const isGUID = /[A-Za-z0-9\+\/]{16}/;
-
-// Find form history entries.
-function searchEntries(terms, params, iter) {
-  let results = [];
-  FormHistory.search(terms, params, { handleResult: result => results.push(result),
-                                      handleError: function (error) {
-                                        do_throw("Error occurred searching form history: " + error);
-                                      },
-                                      handleCompletion: function (reason) { if (!reason) iter.next(results); }
-                                    });
-}
-
-// Count the number of entries with the given name and value, and call then(number)
-// when done. If name or value is null, then the value of that field does not matter.
-function countEntries(name, value, then) {
-  var obj = {};
-  if (name !== null)
-    obj.fieldname = name;
-  if (value !== null)
-    obj.value = value;
-
-  let count = 0;
-  FormHistory.count(obj, { handleResult: result => count = result,
-                           handleError: function (error) {
-                             do_throw("Error occurred searching form history: " + error);
-                           },
-                           handleCompletion: function (reason) { if (!reason) then(count); }
-                         });
-}
-
-// Perform a single form history update and call then() when done.
-function updateEntry(op, name, value, then) {
-  var obj = { op: op };
-  if (name !== null)
-    obj.fieldname = name;
-  if (value !== null)
-    obj.value = value;
-  updateFormHistory(obj, then);
-}
-
-// Add a single form history entry with the current time and call then() when done.
-function addEntry(name, value, then) {
-  let now = Date.now() * 1000;
-  updateFormHistory({ op: "add", fieldname: name, value: value, timesUsed: 1,
-                      firstUsed: now, lastUsed: now }, then);
-}
-
-// Wrapper around FormHistory.update which handles errors. Calls then() when done.
-function updateFormHistory(changes, then) {
-  FormHistory.update(changes, { handleError: function (error) {
-                                  do_throw("Error occurred updating form history: " + error);
-                                },
-                                handleCompletion: function (reason) { if (!reason) then(); },
-                              });
-}
-
-/**
- * Logs info to the console in the standard way (includes the filename).
- *
- * @param aMessage
- *        The message to log to the console.
- */
-function do_log_info(aMessage) {
-  print("TEST-INFO | " + _TEST_FILE + " | " + aMessage);
-}
diff --git a/toolkit/components/satchel/test/unit/perf_autocomplete.js b/toolkit/components/satchel/test/unit/perf_autocomplete.js
deleted file mode 100644
index 6e8bb5125..000000000
--- a/toolkit/components/satchel/test/unit/perf_autocomplete.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/* 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/. */
-
-var testnum = 0;
-var fh;
-var fac;
-var prefs;
-
-function countAllEntries() {
-    let stmt = fh.DBConnection.createStatement("SELECT COUNT(*) as numEntries FROM moz_formhistory");
-    do_check_true(stmt.executeStep());
-    let numEntries = stmt.row.numEntries;
-    stmt.finalize();
-    return numEntries;
-}
-
-function do_AC_search(searchTerm, previousResult) {
-    var duration = 0;
-    var searchCount = 5;
-    var tempPrevious = null;
-    var startTime;
-    for (var i = 0; i < searchCount; i++) {
-        if (previousResult !== null)
-            tempPrevious = fac.autoCompleteSearch("searchbar-history", previousResult, null, null);
-        startTime = Date.now();
-        results = fac.autoCompleteSearch("searchbar-history", searchTerm, null, tempPrevious);
-        duration += Date.now() - startTime;
-    }
-    dump("[autoCompleteSearch][test " + testnum + "] for '" + searchTerm + "' ");
-    if (previousResult !== null)
-        dump("with '" + previousResult + "' previous result ");
-    else
-        dump("w/o previous result ");
-    dump("took " + duration + " ms with " + results.matchCount + " matches.  ");
-    dump("Average of " + Math.round(duration / searchCount) + " ms per search\n");
-    return results;
-}
-
-function run_test() {
-    try {
-
-        // ===== test init =====
-        var testfile = do_get_file("formhistory_1000.sqlite");
-        var profileDir = dirSvc.get("ProfD", Ci.nsIFile);
-        var results;
-
-        // Cleanup from any previous tests or failures.
-        var destFile = profileDir.clone();
-        destFile.append("formhistory.sqlite");
-        if (destFile.exists())
-          destFile.remove(false);
-
-        testfile.copyTo(profileDir, "formhistory.sqlite");
-
-        fh = Cc["@mozilla.org/satchel/form-history;1"].
-             getService(Ci.nsIFormHistory2);
-        fac = Cc["@mozilla.org/satchel/form-autocomplete;1"].
-              getService(Ci.nsIFormAutoComplete);
-        prefs = Cc["@mozilla.org/preferences-service;1"].
-                getService(Ci.nsIPrefBranch);
-
-        timeGroupingSize = prefs.getIntPref("browser.formfill.timeGroupingSize") * 1000 * 1000;
-        maxTimeGroupings = prefs.getIntPref("browser.formfill.maxTimeGroupings");
-        bucketSize = prefs.getIntPref("browser.formfill.bucketSize");
-
-        // ===== 1 =====
-        // Check initial state is as expected
-        testnum++;
-        do_check_true(fh.hasEntries);
-        do_check_eq(1000, countAllEntries());
-        fac.autoCompleteSearch("searchbar-history", "zzzzzzzzzz", null, null); // warm-up search
-        do_check_true(fh.nameExists("searchbar-history"));
-
-        // ===== 2 =====
-        // Search for '' with no previous result
-        testnum++;
-        results = do_AC_search("", null);
-        do_check_true(results.matchCount > 0);
-
-        // ===== 3 =====
-        // Search for 'r' with no previous result
-        testnum++;
-        results = do_AC_search("r", null);
-        do_check_true(results.matchCount > 0);
-
-        // ===== 4 =====
-        // Search for 'r' with '' previous result
-        testnum++;
-        results = do_AC_search("r", "");
-        do_check_true(results.matchCount > 0);
-
-        // ===== 5 =====
-        // Search for 're' with no previous result
-        testnum++;
-        results = do_AC_search("re", null);
-        do_check_true(results.matchCount > 0);
-
-        // ===== 6 =====
-        // Search for 're' with 'r' previous result
-        testnum++;
-        results = do_AC_search("re", "r");
-        do_check_true(results.matchCount > 0);
-
-        // ===== 7 =====
-        // Search for 'rea' without previous result
-        testnum++;
-        results = do_AC_search("rea", null);
-        let countREA = results.matchCount;
-
-        // ===== 8 =====
-        // Search for 'rea' with 're' previous result
-        testnum++;
-        results = do_AC_search("rea", "re");
-        do_check_eq(countREA, results.matchCount);
-
-        // ===== 9 =====
-        // Search for 'real' with 'rea' previous result
-        testnum++;
-        results = do_AC_search("real", "rea");
-        let countREAL = results.matchCount;
-        do_check_true(results.matchCount <= countREA);
-
-        // ===== 10 =====
-        // Search for 'real' with 're' previous result
-        testnum++;
-        results = do_AC_search("real", "re");
-        do_check_eq(countREAL, results.matchCount);
-
-        // ===== 11 =====
-        // Search for 'real' with no previous result
-        testnum++;
-        results = do_AC_search("real", null);
-        do_check_eq(countREAL, results.matchCount);
-
-
-    } catch (e) {
-      throw "FAILED in test #" + testnum + " -- " + e;
-    }
-}
diff --git a/toolkit/components/satchel/test/unit/test_async_expire.js b/toolkit/components/satchel/test/unit/test_async_expire.js
deleted file mode 100644
index 501cbdfe5..000000000
--- a/toolkit/components/satchel/test/unit/test_async_expire.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/* 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/. */
-
-var dbFile, oldSize;
-var currentTestIndex = 0;
-
-function triggerExpiration() {
-  // We can't easily fake a "daily idle" event, so for testing purposes form
-  // history listens for another notification to trigger an immediate
-  // expiration.
-  Services.obs.notifyObservers(null, "formhistory-expire-now", null);
-}
-
-var checkExists = function(num) { do_check_true(num > 0); next_test(); }
-var checkNotExists = function(num) { do_check_true(!num); next_test(); }
-
-var TestObserver = {
-  QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
-
-  observe : function (subject, topic, data) {
-    do_check_eq(topic, "satchel-storage-changed");
-
-    if (data == "formhistory-expireoldentries") {
-      next_test();
-    }
-  }
-};
-
-function test_finished() {
-  // Make sure we always reset prefs.
-  if (Services.prefs.prefHasUserValue("browser.formfill.expire_days"))
-    Services.prefs.clearUserPref("browser.formfill.expire_days");
-
-  do_test_finished();
-}
-
-var iter = tests();
-
-function run_test()
-{
-  do_test_pending();
-  iter.next();
-}
-
-function next_test()
-{
-  iter.next();
-}
-
-function* tests()
-{
-  Services.obs.addObserver(TestObserver, "satchel-storage-changed", true);
-
-  // ===== test init =====
-  var testfile = do_get_file("asyncformhistory_expire.sqlite");
-  var profileDir = do_get_profile();
-
-  // Cleanup from any previous tests or failures.
-  dbFile = profileDir.clone();
-  dbFile.append("formhistory.sqlite");
-  if (dbFile.exists())
-    dbFile.remove(false);
-
-  testfile.copyTo(profileDir, "formhistory.sqlite");
-  do_check_true(dbFile.exists());
-
-  // We're going to clear this at the end, so it better have the default value now.
-  do_check_false(Services.prefs.prefHasUserValue("browser.formfill.expire_days"));
-
-  // Sanity check initial state
-  yield countEntries(null, null, function(num) { do_check_eq(508, num); next_test(); });
-  yield countEntries("name-A", "value-A", checkExists); // lastUsed == distant past
-  yield countEntries("name-B", "value-B", checkExists); // lastUsed == distant future
-
-  do_check_eq(CURRENT_SCHEMA, FormHistory.schemaVersion);
-
-  // Add a new entry
-  yield countEntries("name-C", "value-C", checkNotExists);
-  yield addEntry("name-C", "value-C", next_test);
-  yield countEntries("name-C", "value-C", checkExists);
-
-  // Update some existing entries to have ages relative to when the test runs.
-  var now = 1000 * Date.now();
-  let updateLastUsed = function updateLastUsedFn(results, age)
-  {
-    let lastUsed = now - age * 24 * PR_HOURS;
-
-    let changes = [ ];
-    for (let r = 0; r < results.length; r++) {
-      changes.push({ op: "update", lastUsed: lastUsed, guid: results[r].guid });
-    }
-
-    return changes;
-  }
-
-  let results = yield searchEntries(["guid"], { lastUsed: 181 }, iter);
-  yield updateFormHistory(updateLastUsed(results, 181), next_test);
-
-  results = yield searchEntries(["guid"], { lastUsed: 179 }, iter);
-  yield updateFormHistory(updateLastUsed(results, 179), next_test);
-
-  results = yield searchEntries(["guid"], { lastUsed: 31 }, iter);
-  yield updateFormHistory(updateLastUsed(results, 31), next_test);
-
-  results = yield searchEntries(["guid"], { lastUsed: 29 }, iter);
-  yield updateFormHistory(updateLastUsed(results, 29), next_test);
-
-  results = yield searchEntries(["guid"], { lastUsed: 9999 }, iter);
-  yield updateFormHistory(updateLastUsed(results, 11), next_test);
-
-  results = yield searchEntries(["guid"], { lastUsed: 9 }, iter);
-  yield updateFormHistory(updateLastUsed(results, 9), next_test);
-
-  yield countEntries("name-A", "value-A", checkExists);
-  yield countEntries("181DaysOld", "foo", checkExists);
-  yield countEntries("179DaysOld", "foo", checkExists);
-  yield countEntries(null, null, function(num) { do_check_eq(509, num); next_test(); });
-
-  // 2 entries are expected to expire.
-  triggerExpiration();
-  yield;
-
-  yield countEntries("name-A", "value-A", checkNotExists);
-  yield countEntries("181DaysOld", "foo", checkNotExists);
-  yield countEntries("179DaysOld", "foo", checkExists);
-  yield countEntries(null, null, function(num) { do_check_eq(507, num); next_test(); });
-
-  // And again. No change expected.
-  triggerExpiration();
-  yield;
-
-  yield countEntries(null, null, function(num) { do_check_eq(507, num); next_test(); });
-
-  // Set formfill pref to 30 days.
-  Services.prefs.setIntPref("browser.formfill.expire_days", 30);
-  yield countEntries("179DaysOld", "foo", checkExists);
-  yield countEntries("bar", "31days", checkExists);
-  yield countEntries("bar", "29days", checkExists);
-  yield countEntries(null, null, function(num) { do_check_eq(507, num); next_test(); });
-
-  triggerExpiration();
-  yield;
-
-  yield countEntries("179DaysOld", "foo", checkNotExists);
-  yield countEntries("bar", "31days", checkNotExists);
-  yield countEntries("bar", "29days", checkExists);
-  yield countEntries(null, null, function(num) { do_check_eq(505, num); next_test(); });
-
-  // Set override pref to 10 days and expire. This expires a large batch of
-  // entries, and should trigger a VACCUM to reduce file size.
-  Services.prefs.setIntPref("browser.formfill.expire_days", 10);
-
-  yield countEntries("bar", "29days", checkExists);
-  yield countEntries("9DaysOld", "foo", checkExists);
-  yield countEntries(null, null, function(num) { do_check_eq(505, num); next_test(); });
-
-  triggerExpiration();
-  yield;
-
-  yield countEntries("bar", "29days", checkNotExists);
-  yield countEntries("9DaysOld", "foo", checkExists);
-  yield countEntries("name-B", "value-B", checkExists);
-  yield countEntries("name-C", "value-C", checkExists);
-  yield countEntries(null, null, function(num) { do_check_eq(3, num); next_test(); });
-
-  test_finished();
-}
diff --git a/toolkit/components/satchel/test/unit/test_autocomplete.js b/toolkit/components/satchel/test/unit/test_autocomplete.js
deleted file mode 100644
index 211753809..000000000
--- a/toolkit/components/satchel/test/unit/test_autocomplete.js
+++ /dev/null
@@ -1,266 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-var testnum = 0;
-var fac;
-var prefs;
-
-var numRecords, timeGroupingSize, now;
-
-const DEFAULT_EXPIRE_DAYS = 180;
-
-function padLeft(number, length) {
-    var str = number + '';
-    while (str.length < length)
-        str = '0' + str;
-    return str;
-}
-
-function getFormExpiryDays() {
-    if (prefs.prefHasUserValue("browser.formfill.expire_days")) {
-        return prefs.getIntPref("browser.formfill.expire_days");
-    }
-    return DEFAULT_EXPIRE_DAYS;
-}
-
-function run_test() {
-    // ===== test init =====
-    var testfile = do_get_file("formhistory_autocomplete.sqlite");
-    var profileDir = dirSvc.get("ProfD", Ci.nsIFile);
-
-    // Cleanup from any previous tests or failures.
-    var destFile = profileDir.clone();
-    destFile.append("formhistory.sqlite");
-    if (destFile.exists())
-      destFile.remove(false);
-
-    testfile.copyTo(profileDir, "formhistory.sqlite");
-
-    fac = Cc["@mozilla.org/satchel/form-autocomplete;1"].
-          getService(Ci.nsIFormAutoComplete);
-    prefs = Cc["@mozilla.org/preferences-service;1"].
-            getService(Ci.nsIPrefBranch);
-
-    timeGroupingSize = prefs.getIntPref("browser.formfill.timeGroupingSize") * 1000 * 1000;
-
-    run_next_test();
-}
-
-add_test(function test0() {
-    var maxTimeGroupings = prefs.getIntPref("browser.formfill.maxTimeGroupings");
-    var bucketSize = prefs.getIntPref("browser.formfill.bucketSize");
-
-    // ===== Tests with constant timesUsed and varying lastUsed date =====
-    // insert 2 records per bucket to check alphabetical sort within
-    now = 1000 * Date.now();
-    numRecords = Math.ceil(maxTimeGroupings / bucketSize) * 2;
-
-    let changes = [ ];
-    for (let i = 0; i < numRecords; i+=2) {
-        let useDate = now - (i/2 * bucketSize * timeGroupingSize);
-
-        changes.push({ op : "add", fieldname: "field1", value: "value" + padLeft(numRecords - 1 - i, 2),
-                       timesUsed: 1, firstUsed: useDate, lastUsed: useDate });
-        changes.push({ op : "add", fieldname: "field1", value: "value" + padLeft(numRecords - 2 - i, 2),
-                       timesUsed: 1, firstUsed: useDate, lastUsed: useDate });
-    }
-
-    updateFormHistory(changes, run_next_test);
-});
-
-add_test(function test1() {
-    do_log_info("Check initial state is as expected");
-
-    countEntries(null, null, function () {
-      countEntries("field1", null, function (count) {
-        do_check_true(count > 0);
-        run_next_test();
-      });
-    });
-});
-
-add_test(function test2() {
-    do_log_info("Check search contains all entries");
-
-    fac.autoCompleteSearchAsync("field1", "", null, null, null, {
-        onSearchCompletion : function(aResults) {
-            do_check_eq(numRecords, aResults.matchCount);
-            run_next_test();
-        }
-    });
-});
-
-add_test(function test3() {
-    do_log_info("Check search result ordering with empty search term");
-
-    let lastFound = numRecords;
-    fac.autoCompleteSearchAsync("field1", "", null, null, null, {
-        onSearchCompletion : function(aResults) {
-            for (let i = 0; i < numRecords; i+=2) {
-                do_check_eq(parseInt(aResults.getValueAt(i + 1).substr(5), 10), --lastFound);
-                do_check_eq(parseInt(aResults.getValueAt(i).substr(5), 10), --lastFound);
-            }
-            run_next_test();
-        }
-    });
-});
-
-add_test(function test4() {
-    do_log_info("Check search result ordering with \"v\"");
-
-    let lastFound = numRecords;
-    fac.autoCompleteSearchAsync("field1", "v", null, null, null, {
-        onSearchCompletion : function(aResults) {
-            for (let i = 0; i < numRecords; i+=2) {
-                do_check_eq(parseInt(aResults.getValueAt(i + 1).substr(5), 10), --lastFound);
-                do_check_eq(parseInt(aResults.getValueAt(i).substr(5), 10), --lastFound);
-            }
-            run_next_test();
-        }
-    });
-});
-
-const timesUsedSamples = 20;
-
-add_test(function test5() {
-    do_log_info("Begin tests with constant use dates and varying timesUsed");
-
-    let changes =  [];
-    for (let i = 0; i < timesUsedSamples; i++) {
-        let timesUsed = (timesUsedSamples - i);
-        let change = { op : "add", fieldname: "field2", value: "value" + (timesUsedSamples - 1 -  i),
-                       timesUsed: timesUsed * timeGroupingSize, firstUsed: now, lastUsed: now };
-        changes.push(change);
-    }
-    updateFormHistory(changes, run_next_test);
-});
-
-add_test(function test6() {
-    do_log_info("Check search result ordering with empty search term");
-
-    let lastFound = timesUsedSamples;
-    fac.autoCompleteSearchAsync("field2", "", null, null, null, {
-        onSearchCompletion : function(aResults) {
-            for (let i = 0; i < timesUsedSamples; i++) {
-                do_check_eq(parseInt(aResults.getValueAt(i).substr(5)), --lastFound);
-            }
-            run_next_test();
-        }
-    });
-});
-
-add_test(function test7() {
-    do_log_info("Check search result ordering with \"v\"");
-
-    let lastFound = timesUsedSamples;
-    fac.autoCompleteSearchAsync("field2", "v", null, null, null, {
-        onSearchCompletion : function(aResults) {
-            for (let i = 0; i < timesUsedSamples; i++) {
-                do_check_eq(parseInt(aResults.getValueAt(i).substr(5)), --lastFound);
-            }
-            run_next_test();
-        }
-    });
-});
-
-add_test(function test8() {
-    do_log_info("Check that \"senior citizen\" entries get a bonus (browser.formfill.agedBonus)");
-
-    let agedDate = 1000 * (Date.now() - getFormExpiryDays() * 24 * 60 * 60 * 1000);
-
-    let changes = [ ];
-    changes.push({ op : "add", fieldname: "field3", value: "old but not senior",
-                   timesUsed: 100, firstUsed: (agedDate + 60 * 1000 * 1000), lastUsed: now });
-    changes.push({ op : "add", fieldname: "field3", value: "senior citizen",
-                   timesUsed: 100, firstUsed: (agedDate - 60 * 1000 * 1000), lastUsed: now });
-    updateFormHistory(changes, run_next_test);
-});
-
-add_test(function test9() {
-    fac.autoCompleteSearchAsync("field3", "", null, null, null, {
-        onSearchCompletion : function(aResults) {
-            do_check_eq(aResults.getValueAt(0), "senior citizen");
-            do_check_eq(aResults.getValueAt(1), "old but not senior");
-            run_next_test();
-        }
-    });
-});
-
-add_test(function test10() {
-    do_log_info("Check entries that are really old or in the future");
-
-    let changes = [ ];
-    changes.push({ op : "add", fieldname: "field4", value: "date of 0",
-                   timesUsed: 1, firstUsed: 0, lastUsed: 0 });
-    changes.push({ op : "add", fieldname: "field4", value: "in the future 1",
-                   timesUsed: 1, firstUsed: 0, lastUsed: now * 2 });
-    changes.push({ op : "add", fieldname: "field4", value: "in the future 2",
-                   timesUsed: 1, firstUsed: now * 2, lastUsed: now * 2 });
-    updateFormHistory(changes, run_next_test);
-});
-
-add_test(function test11() {
-    fac.autoCompleteSearchAsync("field4", "", null, null, null, {
-        onSearchCompletion : function(aResults) {
-            do_check_eq(aResults.matchCount, 3);
-            run_next_test();
-        }
-    });
-});
-
-var syncValues = ["sync1", "sync1a", "sync2", "sync3"]
-
-add_test(function test12() {
-    do_log_info("Check old synchronous api");
-
-    let changes = [ ];
-    for (let value of syncValues) {
-      changes.push({ op : "add", fieldname: "field5", value: value });
-    }
-    updateFormHistory(changes, run_next_test);
-});
-
-add_test(function test_token_limit_DB() {
-    function test_token_limit_previousResult(previousResult) {
-        do_log_info("Check that the number of tokens used in a search is not capped to " +
-                    "MAX_SEARCH_TOKENS when using a previousResult");
-        // This provide more accuracy since performance is less of an issue.
-        // Search for a string where the first 10 tokens match the previous value but the 11th does not
-        // when re-using a previous result.
-        fac.autoCompleteSearchAsync("field_token_cap",
-                                    "a b c d e f g h i j .",
-                                    null, previousResult, null, {
-                                        onSearchCompletion : function(aResults) {
-                                            do_check_eq(aResults.matchCount, 0,
-                                                        "All search tokens should be used with " +
-                                                        "previous results");
-                                            run_next_test();
-                                        }
-                                    });
-    }
-
-    do_log_info("Check that the number of tokens used in a search is capped to MAX_SEARCH_TOKENS " +
-                "for performance when querying the DB");
-    let changes = [ ];
-    changes.push({ op : "add", fieldname: "field_token_cap",
-                   // value with 15 unique tokens
-                   value: "a b c d e f g h i j k l m n o",
-                   timesUsed: 1, firstUsed: 0, lastUsed: 0 });
-    updateFormHistory(changes, () => {
-        // Search for a string where the first 10 tokens match the value above but the 11th does not
-        // (which would prevent the result from being returned if the 11th term was used).
-        fac.autoCompleteSearchAsync("field_token_cap",
-                                    "a b c d e f g h i j .",
-                                    null, null, null, {
-                                        onSearchCompletion : function(aResults) {
-                                            do_check_eq(aResults.matchCount, 1,
-                                                        "Only the first MAX_SEARCH_TOKENS tokens " +
-                                                        "should be used for DB queries");
-                                            test_token_limit_previousResult(aResults);
-                                        }
-        });
-    });
-});
diff --git a/toolkit/components/satchel/test/unit/test_db_corrupt.js b/toolkit/components/satchel/test/unit/test_db_corrupt.js
deleted file mode 100644
index a6fdc4c02..000000000
--- a/toolkit/components/satchel/test/unit/test_db_corrupt.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/* 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/. */
-
-var bakFile;
-
-function run_test() {
-  // ===== test init =====
-  let testfile = do_get_file("formhistory_CORRUPT.sqlite");
-  let profileDir = dirSvc.get("ProfD", Ci.nsIFile);
-
-  // Cleanup from any previous tests or failures.
-  let destFile = profileDir.clone();
-  destFile.append("formhistory.sqlite");
-  if (destFile.exists())
-    destFile.remove(false);
-
-  bakFile = profileDir.clone();
-  bakFile.append("formhistory.sqlite.corrupt");
-  if (bakFile.exists())
-    bakFile.remove(false);
-
-  testfile.copyTo(profileDir, "formhistory.sqlite");
-  run_next_test();
-}
-
-add_test(function test_corruptFormHistoryDB_lazyCorruptInit1() {
-  do_log_info("ensure FormHistory backs up a corrupt DB on initialization.");
-
-  // DB init is done lazily so the DB shouldn't be created yet.
-  do_check_false(bakFile.exists());
-  // Doing any request to the DB should create it.
-  countEntries(null, null, run_next_test);
-});
-
-add_test(function test_corruptFormHistoryDB_lazyCorruptInit2() {
-  do_check_true(bakFile.exists());
-  bakFile.remove(false);
-  run_next_test();
-});
-
-
-add_test(function test_corruptFormHistoryDB_emptyInit() {
-  do_log_info("test that FormHistory initializes an empty DB in place of corrupt DB.");
-
-  FormHistory.count({}, {
-    handleResult : function(aNumEntries) {
-      do_check_true(aNumEntries == 0);
-      FormHistory.count({ fieldname : "name-A", value : "value-A" }, {
-        handleResult : function(aNumEntries2) {
-          do_check_true(aNumEntries2 == 0);
-          run_next_test();
-        },
-        handleError : function(aError2) {
-          do_throw("DB initialized after reading a corrupt DB file found an entry.");
-        }
-      });
-    },
-    handleError : function (aError) {
-      do_throw("DB initialized after reading a corrupt DB file is not empty.");
-    }
-  });
-});
-
-add_test(function test_corruptFormHistoryDB_addEntry() {
-  do_log_info("test adding an entry to the empty DB.");
-
-  updateEntry("add", "name-A", "value-A",
-    function() {
-      countEntries("name-A", "value-A",
-        function(count) {
-          do_check_true(count == 1);
-          run_next_test();
-        });
-    });
-  });
-
-add_test(function test_corruptFormHistoryDB_removeEntry() {
-  do_log_info("test removing an entry to the empty DB.");
-
-  updateEntry("remove", "name-A", "value-A",
-    function() {
-      countEntries("name-A", "value-A",
-        function(count) {
-          do_check_true(count == 0);
-          run_next_test();
-        });
-    });
-  });
diff --git a/toolkit/components/satchel/test/unit/test_db_update_v4.js b/toolkit/components/satchel/test/unit/test_db_update_v4.js
deleted file mode 100644
index 84b17e8a0..000000000
--- a/toolkit/components/satchel/test/unit/test_db_update_v4.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/* 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/. */
-
-var testnum = 0;
-
-var iter;
-
-function run_test()
-{
-  do_test_pending();
-  iter = next_test();
-  iter.next();
-}
-
-function* next_test()
-{
-  try {
-
-  // ===== test init =====
-  var testfile = do_get_file("formhistory_v3.sqlite");
-  var profileDir = dirSvc.get("ProfD", Ci.nsIFile);
-
-  // Cleanup from any previous tests or failures.
-  var destFile = profileDir.clone();
-  destFile.append("formhistory.sqlite");
-  if (destFile.exists())
-    destFile.remove(false);
-
-  testfile.copyTo(profileDir, "formhistory.sqlite");
-  do_check_eq(3, getDBVersion(testfile));
-
-  // ===== 1 =====
-  testnum++;
-
-  destFile = profileDir.clone();
-  destFile.append("formhistory.sqlite");
-  let dbConnection = Services.storage.openUnsharedDatabase(destFile);
-
-  // check for upgraded schema.
-  do_check_eq(CURRENT_SCHEMA, FormHistory.schemaVersion);
-
-  // Check that the index was added
-  do_check_true(dbConnection.tableExists("moz_deleted_formhistory"));
-  dbConnection.close();
-
-  // check for upgraded schema.
-  do_check_eq(CURRENT_SCHEMA, FormHistory.schemaVersion);
-  // check that an entry still exists
-  yield countEntries("name-A", "value-A",
-    function (num) {
-      do_check_true(num > 0);
-      do_test_finished();
-    }
-  );
-
-  } catch (e) {
-    throw "FAILED in test #" + testnum + " -- " + e;
-  }
-}
diff --git a/toolkit/components/satchel/test/unit/test_db_update_v4b.js b/toolkit/components/satchel/test/unit/test_db_update_v4b.js
deleted file mode 100644
index 356d34a48..000000000
--- a/toolkit/components/satchel/test/unit/test_db_update_v4b.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/* 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/. */
-
-var testnum = 0;
-
-var iter;
-
-function run_test()
-{
-  do_test_pending();
-  iter = next_test();
-  iter.next();
-}
-
-function* next_test()
-{
-  try {
-
-  // ===== test init =====
-  var testfile = do_get_file("formhistory_v3v4.sqlite");
-  var profileDir = dirSvc.get("ProfD", Ci.nsIFile);
-
-  // Cleanup from any previous tests or failures.
-  var destFile = profileDir.clone();
-  destFile.append("formhistory.sqlite");
-  if (destFile.exists())
-    destFile.remove(false);
-
-  testfile.copyTo(profileDir, "formhistory.sqlite");
-  do_check_eq(3, getDBVersion(testfile));
-
-  // ===== 1 =====
-  testnum++;
-
-  destFile = profileDir.clone();
-  destFile.append("formhistory.sqlite");
-  dbConnection = Services.storage.openUnsharedDatabase(destFile);
-
-  // check for upgraded schema.
-  do_check_eq(CURRENT_SCHEMA, FormHistory.schemaVersion);
-
-  // Check that the index was added
-  do_check_true(dbConnection.tableExists("moz_deleted_formhistory"));
-  dbConnection.close();
-
-  // check that an entry still exists
-  yield countEntries("name-A", "value-A",
-    function (num) {
-      do_check_true(num > 0);
-      do_test_finished();
-    }
-  );
-
-  } catch (e) {
-    throw "FAILED in test #" + testnum + " -- " + e;
-  }
-}
diff --git a/toolkit/components/satchel/test/unit/test_db_update_v999a.js b/toolkit/components/satchel/test/unit/test_db_update_v999a.js
deleted file mode 100644
index 0a44d06aa..000000000
--- a/toolkit/components/satchel/test/unit/test_db_update_v999a.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/* 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/. */
-
-/*
- * This test uses a formhistory.sqlite with schema version set to 999 (a
- * future version). This exercies the code that allows using a future schema
- * version as long as the expected columns are present.
- *
- * Part A tests this when the columns do match, so the DB is used.
- * Part B tests this when the columns do *not* match, so the DB is reset.
- */
-
-var iter = tests();
-
-function run_test()
-{
-  do_test_pending();
-  iter.next();
-}
-
-function next_test()
-{
-  iter.next();
-}
-
-function* tests()
-{
-  try {
-  var testnum = 0;
-
-  // ===== test init =====
-  var testfile = do_get_file("formhistory_v999a.sqlite");
-  var profileDir = dirSvc.get("ProfD", Ci.nsIFile);
-
-  // Cleanup from any previous tests or failures.
-  var destFile = profileDir.clone();
-  destFile.append("formhistory.sqlite");
-  if (destFile.exists())
-    destFile.remove(false);
-
-  testfile.copyTo(profileDir, "formhistory.sqlite");
-  do_check_eq(999, getDBVersion(testfile));
-
-  let checkZero = function(num) { do_check_eq(num, 0); next_test(); }
-  let checkOne = function(num) { do_check_eq(num, 1); next_test(); }
-
-  // ===== 1 =====
-  testnum++;
-  // Check for expected contents.
-  yield countEntries(null, null, function(num) { do_check_true(num > 0); next_test(); });
-  yield countEntries("name-A", "value-A", checkOne);
-  yield countEntries("name-B", "value-B", checkOne);
-  yield countEntries("name-C", "value-C1", checkOne);
-  yield countEntries("name-C", "value-C2", checkOne);
-  yield countEntries("name-E", "value-E", checkOne);
-
-  // check for downgraded schema.
-  do_check_eq(CURRENT_SCHEMA, FormHistory.schemaVersion);
-
-  // ===== 2 =====
-  testnum++;
-  // Exercise adding and removing a name/value pair
-  yield countEntries("name-D", "value-D", checkZero);
-  yield updateEntry("add", "name-D", "value-D", next_test);
-  yield countEntries("name-D", "value-D", checkOne);
-  yield updateEntry("remove", "name-D", "value-D", next_test);
-  yield countEntries("name-D", "value-D", checkZero);
-
-  } catch (e) {
-    throw "FAILED in test #" + testnum + " -- " + e;
-  }
-
-  do_test_finished();
-}
diff --git a/toolkit/components/satchel/test/unit/test_db_update_v999b.js b/toolkit/components/satchel/test/unit/test_db_update_v999b.js
deleted file mode 100644
index fb0ecd1b7..000000000
--- a/toolkit/components/satchel/test/unit/test_db_update_v999b.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/* 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/. */
-
-/*
- * This test uses a formhistory.sqlite with schema version set to 999 (a
- * future version). This exercies the code that allows using a future schema
- * version as long as the expected columns are present.
- *
- * Part A tests this when the columns do match, so the DB is used.
- * Part B tests this when the columns do *not* match, so the DB is reset.
- */
-
-var iter = tests();
-
-function run_test()
-{
-  do_test_pending();
-  iter.next();
-}
-
-function next_test()
-{
-  iter.next();
-}
-
-function* tests()
-{
-  try {
-  var testnum = 0;
-
-  // ===== test init =====
-  var testfile = do_get_file("formhistory_v999b.sqlite");
-  var profileDir = dirSvc.get("ProfD", Ci.nsIFile);
-
-  // Cleanup from any previous tests or failures.
-  var destFile = profileDir.clone();
-  destFile.append("formhistory.sqlite");
-  if (destFile.exists())
-    destFile.remove(false);
-
-  var bakFile = profileDir.clone();
-  bakFile.append("formhistory.sqlite.corrupt");
-  if (bakFile.exists())
-    bakFile.remove(false);
-
-  testfile.copyTo(profileDir, "formhistory.sqlite");
-  do_check_eq(999, getDBVersion(testfile));
-
-  let checkZero = function(num) { do_check_eq(num, 0); next_test(); }
-  let checkOne = function(num) { do_check_eq(num, 1); next_test(); }
-
-  // ===== 1 =====
-  testnum++;
-
-  // Open the DB, ensure that a backup of the corrupt DB is made.
-  // DB init is done lazily so the DB shouldn't be created yet.
-  do_check_false(bakFile.exists());
-  // Doing any request to the DB should create it.
-  yield countEntries("", "", next_test);
-
-  do_check_true(bakFile.exists());
-  bakFile.remove(false);
-
-  // ===== 2 =====
-  testnum++;
-  // File should be empty
-  yield countEntries(null, null, function(num) { do_check_false(num); next_test(); });
-  yield countEntries("name-A", "value-A", checkZero);
-  // check for current schema.
-  do_check_eq(CURRENT_SCHEMA, FormHistory.schemaVersion);
-
-  // ===== 3 =====
-  testnum++;
-  // Try adding an entry
-  yield updateEntry("add", "name-A", "value-A", next_test);
-  yield countEntries(null, null, checkOne);
-  yield countEntries("name-A", "value-A", checkOne);
-
-  // ===== 4 =====
-  testnum++;
-  // Try removing an entry
-  yield updateEntry("remove", "name-A", "value-A", next_test);
-  yield countEntries(null, null, checkZero);
-  yield countEntries("name-A", "value-A", checkZero);
-
-  } catch (e) {
-    throw "FAILED in test #" + testnum + " -- " + e;
-  }
-
-  do_test_finished();
-}
diff --git a/toolkit/components/satchel/test/unit/test_history_api.js b/toolkit/components/satchel/test/unit/test_history_api.js
deleted file mode 100644
index 753504183..000000000
--- a/toolkit/components/satchel/test/unit/test_history_api.js
+++ /dev/null
@@ -1,457 +0,0 @@
-/* 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/. */
-
-var testnum = 0;
-var dbConnection; // used for deleted table tests
-
-Cu.import("resource://gre/modules/Promise.jsm");
-
-function countDeletedEntries(expected)
-{
-  let deferred = Promise.defer();
-  let stmt = dbConnection.createAsyncStatement("SELECT COUNT(*) AS numEntries FROM moz_deleted_formhistory");
-  stmt.executeAsync({
-    handleResult: function(resultSet) {
-      do_check_eq(expected, resultSet.getNextRow().getResultByName("numEntries"));
-      deferred.resolve();
-    },
-    handleError : function () {
-      do_throw("Error occurred counting deleted entries: " + error);
-      deferred.reject();
-    },
-    handleCompletion : function () {
-      stmt.finalize();
-    }
-  });
-  return deferred.promise;
-}
-
-function checkTimeDeleted(guid, checkFunction)
-{
-  let deferred = Promise.defer();
-  let stmt = dbConnection.createAsyncStatement("SELECT timeDeleted FROM moz_deleted_formhistory WHERE guid = :guid");
-  stmt.params.guid = guid;
-  stmt.executeAsync({
-    handleResult: function(resultSet) {
-      checkFunction(resultSet.getNextRow().getResultByName("timeDeleted"));
-      deferred.resolve();
-    },
-    handleError : function () {
-      do_throw("Error occurred getting deleted entries: " + error);
-      deferred.reject();
-    },
-    handleCompletion : function () {
-      stmt.finalize();
-    }
-  });
-  return deferred.promise;
-}
-
-function promiseUpdateEntry(op, name, value)
-{
-  var change = { op: op };
-  if (name !== null)
-    change.fieldname = name;
-  if (value !== null)
-    change.value = value;
-  return promiseUpdate(change);
-}
-
-function promiseUpdate(change) {
-  return new Promise((resolve, reject) => {
-    FormHistory.update(change, {
-      handleError(error) {
-        this._error = error;
-      },
-      handleCompletion(reason) {
-        if (reason) {
-          reject(this._error);
-        } else {
-          resolve();
-        }
-      }
-    });
-  });
-}
-
-function promiseSearchEntries(terms, params)
-{
-  let deferred = Promise.defer();
-  let results = [];
-  FormHistory.search(terms, params,
-                     { handleResult: result => results.push(result),
-                       handleError: function (error) {
-                         do_throw("Error occurred searching form history: " + error);
-                         deferred.reject(error);
-                       },
-                       handleCompletion: function (reason) { if (!reason) deferred.resolve(results); }
-                     });
-  return deferred.promise;
-}
-
-function promiseCountEntries(name, value, checkFn)
-{
-  let deferred = Promise.defer();
-  countEntries(name, value, function (result) { checkFn(result); deferred.resolve(); } );
-  return deferred.promise;
-}
-
-add_task(function* ()
-{
-  let oldSupportsDeletedTable = FormHistory._supportsDeletedTable;
-  FormHistory._supportsDeletedTable = true;
-
-  try {
-
-  // ===== test init =====
-  var testfile = do_get_file("formhistory_apitest.sqlite");
-  var profileDir = dirSvc.get("ProfD", Ci.nsIFile);
-
-  // Cleanup from any previous tests or failures.
-  var destFile = profileDir.clone();
-  destFile.append("formhistory.sqlite");
-  if (destFile.exists())
-    destFile.remove(false);
-
-  testfile.copyTo(profileDir, "formhistory.sqlite");
-
-  function checkExists(num) { do_check_true(num > 0); }
-  function checkNotExists(num) { do_check_true(num == 0); }
-
-  // ===== 1 =====
-  // Check initial state is as expected
-  testnum++;
-  yield promiseCountEntries("name-A", null, checkExists);
-  yield promiseCountEntries("name-B", null, checkExists);
-  yield promiseCountEntries("name-C", null, checkExists);
-  yield promiseCountEntries("name-D", null, checkExists);
-  yield promiseCountEntries("name-A", "value-A", checkExists);
-  yield promiseCountEntries("name-B", "value-B1", checkExists);
-  yield promiseCountEntries("name-B", "value-B2", checkExists);
-  yield promiseCountEntries("name-C", "value-C", checkExists);
-  yield promiseCountEntries("name-D", "value-D", checkExists);
-  // time-A/B/C/D checked below.
-
-  // Delete anything from the deleted table
-  let dbFile = Services.dirsvc.get("ProfD", Ci.nsIFile).clone();
-  dbFile.append("formhistory.sqlite");
-  dbConnection = Services.storage.openUnsharedDatabase(dbFile);
-
-  let deferred = Promise.defer();
-
-  let stmt = dbConnection.createAsyncStatement("DELETE FROM moz_deleted_formhistory");
-  stmt.executeAsync({
-    handleResult: function(resultSet) { },
-    handleError : function () {
-      do_throw("Error occurred counting deleted all entries: " + error);
-    },
-    handleCompletion : function () {
-      stmt.finalize();
-      deferred.resolve();
-    }
-  });
-  yield deferred.promise;
-
-  // ===== 2 =====
-  // Test looking for nonexistent / bogus data.
-  testnum++;
-  yield promiseCountEntries("blah", null, checkNotExists);
-  yield promiseCountEntries("", null, checkNotExists);
-  yield promiseCountEntries("name-A", "blah", checkNotExists);
-  yield promiseCountEntries("name-A", "", checkNotExists);
-  yield promiseCountEntries("name-A", null, checkExists);
-  yield promiseCountEntries("blah", "value-A", checkNotExists);
-  yield promiseCountEntries("", "value-A", checkNotExists);
-  yield promiseCountEntries(null, "value-A", checkExists);
-
-  // Cannot use promiseCountEntries when name and value are null because it treats null values as not set
-  // and here a search should be done explicity for null.
-  deferred = Promise.defer();
-  yield FormHistory.count({ fieldname: null, value: null },
-                          { handleResult: result => checkNotExists(result),
-                            handleError: function (error) {
-                              do_throw("Error occurred searching form history: " + error);
-                            },
-                            handleCompletion: function(reason) { if (!reason) deferred.resolve() }
-                          });
-  yield deferred.promise;
-
-  // ===== 3 =====
-  // Test removeEntriesForName with a single matching value
-  testnum++;
-  yield promiseUpdateEntry("remove", "name-A", null);
-
-  yield promiseCountEntries("name-A", "value-A", checkNotExists);
-  yield promiseCountEntries("name-B", "value-B1", checkExists);
-  yield promiseCountEntries("name-B", "value-B2", checkExists);
-  yield promiseCountEntries("name-C", "value-C", checkExists);
-  yield promiseCountEntries("name-D", "value-D", checkExists);
-  yield countDeletedEntries(1);
-
-  // ===== 4 =====
-  // Test removeEntriesForName with multiple matching values
-  testnum++;
-  yield promiseUpdateEntry("remove", "name-B", null);
-
-  yield promiseCountEntries("name-A", "value-A", checkNotExists);
-  yield promiseCountEntries("name-B", "value-B1", checkNotExists);
-  yield promiseCountEntries("name-B", "value-B2", checkNotExists);
-  yield promiseCountEntries("name-C", "value-C", checkExists);
-  yield promiseCountEntries("name-D", "value-D", checkExists);
-  yield countDeletedEntries(3);
-
-  // ===== 5 =====
-  // Test removing by time range (single entry, not surrounding entries)
-  testnum++;
-  yield promiseCountEntries("time-A", null, checkExists); // firstUsed=1000, lastUsed=1000
-  yield promiseCountEntries("time-B", null, checkExists); // firstUsed=1000, lastUsed=1099
-  yield promiseCountEntries("time-C", null, checkExists); // firstUsed=1099, lastUsed=1099
-  yield promiseCountEntries("time-D", null, checkExists); // firstUsed=2001, lastUsed=2001
-  yield promiseUpdate({ op : "remove", firstUsedStart: 1050, firstUsedEnd: 2000 });
-
-  yield promiseCountEntries("time-A", null, checkExists);
-  yield promiseCountEntries("time-B", null, checkExists);
-  yield promiseCountEntries("time-C", null, checkNotExists);
-  yield promiseCountEntries("time-D", null, checkExists);
-  yield countDeletedEntries(4);
-
-  // ===== 6 =====
-  // Test removing by time range (multiple entries)
-  testnum++;
-  yield promiseUpdate({ op : "remove", firstUsedStart: 1000, firstUsedEnd: 2000 });
-
-  yield promiseCountEntries("time-A", null, checkNotExists);
-  yield promiseCountEntries("time-B", null, checkNotExists);
-  yield promiseCountEntries("time-C", null, checkNotExists);
-  yield promiseCountEntries("time-D", null, checkExists);
-  yield countDeletedEntries(6);
-
-  // ===== 7 =====
-  // test removeAllEntries
-  testnum++;
-  yield promiseUpdateEntry("remove", null, null);
-
-  yield promiseCountEntries("name-C", null, checkNotExists);
-  yield promiseCountEntries("name-D", null, checkNotExists);
-  yield promiseCountEntries("name-C", "value-C", checkNotExists);
-  yield promiseCountEntries("name-D", "value-D", checkNotExists);
-
-  yield promiseCountEntries(null, null, checkNotExists);
-  yield countDeletedEntries(6);
-
-  // ===== 8 =====
-  // Add a single entry back
-  testnum++;
-  yield promiseUpdateEntry("add", "newname-A", "newvalue-A");
-  yield promiseCountEntries("newname-A", "newvalue-A", checkExists);
-
-  // ===== 9 =====
-  // Remove the single entry
-  testnum++;
-  yield promiseUpdateEntry("remove", "newname-A", "newvalue-A");
-  yield promiseCountEntries("newname-A", "newvalue-A", checkNotExists);
-
-  // ===== 10 =====
-  // Add a single entry
-  testnum++;
-  yield promiseUpdateEntry("add", "field1", "value1");
-  yield promiseCountEntries("field1", "value1", checkExists);
-
-  let processFirstResult = function processResults(results)
-  {
-    // Only handle the first result
-    if (results.length > 0) {
-      let result = results[0];
-      return [result.timesUsed, result.firstUsed, result.lastUsed, result.guid];
-    }
-    return undefined;
-  }
-
-  results = yield promiseSearchEntries(["timesUsed", "firstUsed", "lastUsed"],
-                                       { fieldname: "field1", value: "value1" });
-  let [timesUsed, firstUsed, lastUsed] = processFirstResult(results);
-  do_check_eq(1, timesUsed);
-  do_check_true(firstUsed > 0);
-  do_check_true(lastUsed > 0);
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 1));
-
-  // ===== 11 =====
-  // Add another single entry
-  testnum++;
-  yield promiseUpdateEntry("add", "field1", "value1b");
-  yield promiseCountEntries("field1", "value1", checkExists);
-  yield promiseCountEntries("field1", "value1b", checkExists);
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 2));
-
-  // ===== 12 =====
-  // Update a single entry
-  testnum++;
-
-  results = yield promiseSearchEntries(["guid"], { fieldname: "field1", value: "value1" });
-  let guid = processFirstResult(results)[3];
-
-  yield promiseUpdate({ op : "update", guid: guid, value: "modifiedValue" });
-  yield promiseCountEntries("field1", "modifiedValue", checkExists);
-  yield promiseCountEntries("field1", "value1", checkNotExists);
-  yield promiseCountEntries("field1", "value1b", checkExists);
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 2));
-
-  // ===== 13 =====
-  // Add a single entry with times
-  testnum++;
-  yield promiseUpdate({ op : "add", fieldname: "field2", value: "value2",
-                        timesUsed: 20, firstUsed: 100, lastUsed: 500 });
-
-  results = yield promiseSearchEntries(["timesUsed", "firstUsed", "lastUsed"],
-                                       { fieldname: "field2", value: "value2" });
-  [timesUsed, firstUsed, lastUsed] = processFirstResult(results);
-
-  do_check_eq(20, timesUsed);
-  do_check_eq(100, firstUsed);
-  do_check_eq(500, lastUsed);
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 3));
-
-  // ===== 14 =====
-  // Bump an entry, which updates its lastUsed field
-  testnum++;
-  yield promiseUpdate({ op : "bump", fieldname: "field2", value: "value2",
-                        timesUsed: 20, firstUsed: 100, lastUsed: 500 });
-  results = yield promiseSearchEntries(["timesUsed", "firstUsed", "lastUsed"],
-                                       { fieldname: "field2", value: "value2" });
-  [timesUsed, firstUsed, lastUsed] = processFirstResult(results);
-  do_check_eq(21, timesUsed);
-  do_check_eq(100, firstUsed);
-  do_check_true(lastUsed > 500);
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 3));
-
-  // ===== 15 =====
-  // Bump an entry that does not exist
-  testnum++;
-  yield promiseUpdate({ op : "bump", fieldname: "field3", value: "value3",
-                        timesUsed: 10, firstUsed: 50, lastUsed: 400 });
-  results = yield promiseSearchEntries(["timesUsed", "firstUsed", "lastUsed"],
-                                       { fieldname: "field3", value: "value3" });
-  [timesUsed, firstUsed, lastUsed] = processFirstResult(results);
-  do_check_eq(10, timesUsed);
-  do_check_eq(50, firstUsed);
-  do_check_eq(400, lastUsed);
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 4));
-
-  // ===== 16 =====
-  // Bump an entry with a guid
-  testnum++;
-  results = yield promiseSearchEntries(["guid"], { fieldname: "field3", value: "value3" });
-  guid = processFirstResult(results)[3];
-  yield promiseUpdate({ op : "bump", guid: guid, timesUsed: 20, firstUsed: 55, lastUsed: 400 });
-  results = yield promiseSearchEntries(["timesUsed", "firstUsed", "lastUsed"],
-                                       { fieldname: "field3", value: "value3" });
-  [timesUsed, firstUsed, lastUsed] = processFirstResult(results);
-  do_check_eq(11, timesUsed);
-  do_check_eq(50, firstUsed);
-  do_check_true(lastUsed > 400);
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 4));
-
-  // ===== 17 =====
-  // Remove an entry
-  testnum++;
-  yield countDeletedEntries(7);
-
-  results = yield promiseSearchEntries(["guid"], { fieldname: "field1", value: "value1b" });
-  guid = processFirstResult(results)[3];
-
-  yield promiseUpdate({ op : "remove", guid: guid});
-  yield promiseCountEntries("field1", "modifiedValue", checkExists);
-  yield promiseCountEntries("field1", "value1b", checkNotExists);
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 3));
-
-  yield countDeletedEntries(8);
-  yield checkTimeDeleted(guid, timeDeleted => do_check_true(timeDeleted > 10000));
-
-  // ===== 18 =====
-  // Add yet another single entry
-  testnum++;
-  yield promiseUpdate({ op : "add", fieldname: "field4", value: "value4",
-                        timesUsed: 5, firstUsed: 230, lastUsed: 600 });
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 4));
-
-  // ===== 19 =====
-  // Remove an entry by time
-  testnum++;
-  yield promiseUpdate({ op : "remove", firstUsedStart: 60, firstUsedEnd: 250 });
-  yield promiseCountEntries("field1", "modifiedValue", checkExists);
-  yield promiseCountEntries("field2", "value2", checkNotExists);
-  yield promiseCountEntries("field3", "value3", checkExists);
-  yield promiseCountEntries("field4", "value4", checkNotExists);
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 2));
-  yield countDeletedEntries(10);
-
-  // ===== 20 =====
-  // Bump multiple existing entries at once
-  testnum++;
-
-  yield promiseUpdate([{ op : "add", fieldname: "field5", value: "value5",
-                         timesUsed: 5, firstUsed: 230, lastUsed: 600 },
-                       { op : "add", fieldname: "field6", value: "value6",
-                         timesUsed: 12, firstUsed: 430, lastUsed: 700 }]);
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 4));
-
-  yield promiseUpdate([
-                       { op : "bump", fieldname: "field5", value: "value5" },
-                       { op : "bump", fieldname: "field6", value: "value6" }]);
-  results = yield promiseSearchEntries(["fieldname", "timesUsed", "firstUsed", "lastUsed"], { });
-
-  do_check_eq(6, results[2].timesUsed);
-  do_check_eq(13, results[3].timesUsed);
-  do_check_eq(230, results[2].firstUsed);
-  do_check_eq(430, results[3].firstUsed);
-  do_check_true(results[2].lastUsed > 600);
-  do_check_true(results[3].lastUsed > 700);
-
-  yield promiseCountEntries(null, null, num => do_check_eq(num, 4));
-
-  // ===== 21 =====
-  // Check update fails if form history is disabled and the operation is not a
-  // pure removal.
-  testnum++;
-  Services.prefs.setBoolPref("browser.formfill.enable", false);
-
-  // Cannot use arrow functions, see bug 1237961.
-  Assert.rejects(promiseUpdate(
-                   { op : "bump", fieldname: "field5", value: "value5" }),
-                 function(err) { return err.result == Ci.mozIStorageError.MISUSE; },
-                 "bumping when form history is disabled should fail");
-  Assert.rejects(promiseUpdate(
-                   { op : "add", fieldname: "field5", value: "value5" }),
-                 function(err) { return err.result == Ci.mozIStorageError.MISUSE; },
-                 "Adding when form history is disabled should fail");
-  Assert.rejects(promiseUpdate([
-                     { op : "update", fieldname: "field5", value: "value5" },
-                     { op : "remove", fieldname: "field5", value: "value5" }
-                   ]),
-                 function(err) { return err.result == Ci.mozIStorageError.MISUSE; },
-                 "mixed operations when form history is disabled should fail");
-  Assert.rejects(promiseUpdate([
-                     null, undefined, "", 1, {},
-                     { op : "remove", fieldname: "field5", value: "value5" }
-                   ]),
-                 function(err) { return err.result == Ci.mozIStorageError.MISUSE; },
-                 "Invalid entries when form history is disabled should fail");
-
-  // Remove should work though.
-  yield promiseUpdate([{ op: "remove", fieldname: "field5", value: null },
-                       { op: "remove", fieldname: null, value: null }]);
-  Services.prefs.clearUserPref("browser.formfill.enable");
-
-  } catch (e) {
-    throw "FAILED in test #" + testnum + " -- " + e;
-  }
-  finally {
-    FormHistory._supportsDeletedTable = oldSupportsDeletedTable;
-    dbConnection.asyncClose(do_test_finished);
-  }
-});
-
-function run_test() {
-  return run_next_test();
-}
diff --git a/toolkit/components/satchel/test/unit/test_notify.js b/toolkit/components/satchel/test/unit/test_notify.js
deleted file mode 100644
index 556ecd4b0..000000000
--- a/toolkit/components/satchel/test/unit/test_notify.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Test suite for satchel notifications
- *
- * Tests notifications dispatched when modifying form history.
- *
- */
-
-var expectedNotification;
-var expectedData;
-
-var TestObserver = {
-  QueryInterface : XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
-
-  observe : function (subject, topic, data) {
-    do_check_eq(topic, "satchel-storage-changed");
-    do_check_eq(data, expectedNotification);
-
-    switch (data) {
-        case "formhistory-add":
-        case "formhistory-update":
-            do_check_true(subject instanceof Ci.nsISupportsString);
-            do_check_true(isGUID.test(subject.toString()));
-            break;
-        case "formhistory-remove":
-            do_check_eq(null, subject);
-            break;
-        default:
-            do_throw("Unhandled notification: " + data + " / " + topic);
-    }
-
-    expectedNotification = null;
-    expectedData = null;
-  }
-};
-
-var testIterator = null;
-
-function run_test() {
-  do_test_pending();
-  testIterator = run_test_steps();
-  testIterator.next();
-}
-
-function next_test()
-{
-  testIterator.next();
-}
-
-function* run_test_steps() {
-
-try {
-
-var testnum = 0;
-var testdesc = "Setup of test form history entries";
-
-var entry1 = ["entry1", "value1"];
-
-/* ========== 1 ========== */
-testnum = 1;
-testdesc = "Initial connection to storage module"
-
-yield updateEntry("remove", null, null, next_test);
-yield countEntries(null, null, function (num) { do_check_false(num, "Checking initial DB is empty"); next_test(); });
-
-// Add the observer
-var os = Cc["@mozilla.org/observer-service;1"].
-         getService(Ci.nsIObserverService);
-os.addObserver(TestObserver, "satchel-storage-changed", false);
-
-/* ========== 2 ========== */
-testnum++;
-testdesc = "addEntry";
-
-expectedNotification = "formhistory-add";
-expectedData = entry1;
-
-yield updateEntry("add", entry1[0], entry1[1], next_test);
-do_check_eq(expectedNotification, null); // check that observer got a notification
-
-yield countEntries(entry1[0], entry1[1], function (num) { do_check_true(num > 0); next_test(); });
-
-/* ========== 3 ========== */
-testnum++;
-testdesc = "modifyEntry";
-
-expectedNotification = "formhistory-update";
-expectedData = entry1;
-// will update previous entry
-yield updateEntry("update", entry1[0], entry1[1], next_test);
-yield countEntries(entry1[0], entry1[1], function (num) { do_check_true(num > 0); next_test(); });
-
-do_check_eq(expectedNotification, null);
-
-/* ========== 4 ========== */
-testnum++;
-testdesc = "removeEntry";
-
-expectedNotification = "formhistory-remove";
-expectedData = entry1;
-yield updateEntry("remove", entry1[0], entry1[1], next_test);
-
-do_check_eq(expectedNotification, null);
-yield countEntries(entry1[0], entry1[1], function(num) { do_check_false(num, "doesn't exist after remove"); next_test(); });
-
-/* ========== 5 ========== */
-testnum++;
-testdesc = "removeAllEntries";
-
-expectedNotification = "formhistory-remove";
-expectedData = null; // no data expected
-yield updateEntry("remove", null, null, next_test);
-
-do_check_eq(expectedNotification, null);
-
-/* ========== 6 ========== */
-testnum++;
-testdesc = "removeAllEntries (again)";
-
-expectedNotification = "formhistory-remove";
-expectedData = null;
-yield updateEntry("remove", null, null, next_test);
-
-do_check_eq(expectedNotification, null);
-
-/* ========== 7 ========== */
-testnum++;
-testdesc = "removeEntriesForName";
-
-expectedNotification = "formhistory-remove";
-expectedData = "field2";
-yield updateEntry("remove", null, "field2", next_test);
-
-do_check_eq(expectedNotification, null);
-
-/* ========== 8 ========== */
-testnum++;
-testdesc = "removeEntriesByTimeframe";
-
-expectedNotification = "formhistory-remove";
-expectedData = [10, 99999999999];
-
-yield FormHistory.update({ op: "remove", firstUsedStart: expectedData[0], firstUsedEnd: expectedData[1] },
-                         { handleCompletion: function(reason) { if (!reason) next_test() },
-                           handleErrors: function (error) {
-                             do_throw("Error occurred updating form history: " + error);
-                           }
-                         });
-
-do_check_eq(expectedNotification, null);
-
-os.removeObserver(TestObserver, "satchel-storage-changed", false);
-
-do_test_finished();
-
-} catch (e) {
-    throw "FAILED in test #" + testnum + " -- " + testdesc + ": " + e;
-}
-}
diff --git a/toolkit/components/satchel/test/unit/test_previous_result.js b/toolkit/components/satchel/test/unit/test_previous_result.js
deleted file mode 100644
index 06e5a385b..000000000
--- a/toolkit/components/satchel/test/unit/test_previous_result.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 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/. */
-
-var aaaListener = {
-  onSearchResult: function(search, result) {
-    do_check_eq(result.searchString, "aaa");
-    do_test_finished();
-  }
-};
-
-var aaListener = {
-  onSearchResult: function(search, result) {
-    do_check_eq(result.searchString, "aa");
-    search.startSearch("aaa", "", result, aaaListener);
-  }
-};
-
-function run_test()
-{
-  do_test_pending();
-  let search = Cc['@mozilla.org/autocomplete/search;1?name=form-history'].
-               getService(Components.interfaces.nsIAutoCompleteSearch);
-  search.startSearch("aa", "", null, aaListener);
-}
diff --git a/toolkit/components/satchel/test/unit/xpcshell.ini b/toolkit/components/satchel/test/unit/xpcshell.ini
deleted file mode 100644
index 4a41b47d6..000000000
--- a/toolkit/components/satchel/test/unit/xpcshell.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[DEFAULT]
-head = head_satchel.js
-tail =
-skip-if = toolkit == 'android'
-support-files =
-  asyncformhistory_expire.sqlite
-  formhistory_1000.sqlite
-  formhistory_CORRUPT.sqlite
-  formhistory_apitest.sqlite
-  formhistory_autocomplete.sqlite
-  formhistory_v3.sqlite
-  formhistory_v3v4.sqlite
-  formhistory_v999a.sqlite
-  formhistory_v999b.sqlite
-  perf_autocomplete.js
-
-[test_async_expire.js]
-[test_autocomplete.js]
-[test_db_corrupt.js]
-[test_db_update_v4.js]
-[test_db_update_v4b.js]
-[test_db_update_v999a.js]
-[test_db_update_v999b.js]
-[test_history_api.js]
-[test_notify.js]
-[test_previous_result.js]