deleted file mode 100644
--- a/testing/peptest/MANIFEST.in
+++ /dev/null
@@ -1,1 +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/.

recursive-include peptest/extension *
\ No newline at end of file

deleted file mode 100644
--- a/testing/peptest/Makefile.in
+++ /dev/null
@@ -1,35 +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/.
-
-include $(topsrcdir)/config/rules.mk
-
-PEPTEST_HARNESS = \
-  peptest \
-  $(NULL)
-
-PEPTEST_EXTRAS = \
-  setup.py \
-  runtests.py \
-  MANIFEST.in \
-  README.md \
-  $(NULL)
-
-PEPTEST_TESTS = \
-  tests \
-  $(NULL)
-
-_DEST_DIR = $(DEPTH)/_tests/peptest
-libs:: $(PEPTEST_HARNESS)
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py $^ $(_DEST_DIR)
-libs:: $(PEPTEST_EXTRAS)
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py $^ $(_DEST_DIR)
-libs:: $(PEPTEST_TESTS)
-	$(PYTHON) $(topsrcdir)/config/nsinstall.py $^ $(_DEST_DIR)
-
-stage-package: PKG_STAGE = $(DIST)/test-package-stage
-stage-package:
-	$(NSINSTALL) -D $(PKG_STAGE)/peptest
-	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(PEPTEST_HARNESS)) | (cd $(PKG_STAGE)/peptest && tar -xf -)
-	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(PEPTEST_EXTRAS)) | (cd $(PKG_STAGE)/peptest && tar -xf -)
-	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(PEPTEST_TESTS)) | (cd $(PKG_STAGE)/peptest && tar -xf -)

deleted file mode 100644
--- a/testing/peptest/README.md
+++ /dev/null
@@ -1,16 +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/. -->
-
-[Peptest](https://wiki.mozilla.org/Auto-tools/Projects/peptest) 
-is a Mozilla automated testing harness for running responsiveness tests.
-These tests measure how long events spend away from the event loop.
-
-# Running Tests
-
-Currently tests are run from the command line with python. 
-Peptest currently depends on some external Mozilla python packages, namely: 
-mozrunner, mozprocess, mozprofile, mozinfo, mozlog, mozhttpd and manifestdestiny. 
-
-See [running tests](https://wiki.mozilla.org/Auto-tools/Projects/peptest#Running_Tests) 
-for more information.

deleted file mode 100644
--- a/testing/peptest/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-

deleted file mode 100644
--- a/testing/peptest/peptest/__init__.py
+++ /dev/null
@@ -1,5 +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/.
-
-from runpeptests import *

deleted file mode 100644
--- a/testing/peptest/peptest/extension/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Firefox/Fennec Responsiveness Testing
-
-This tool is meant to measure and report Firefox's responsiveness for various user interactions.  This will be important for measuring Electrolysis performance gains.
-For more information see: https://wiki.mozilla.org/Electrolysis/Firefox/20101117

deleted file mode 100644
--- a/testing/peptest/peptest/extension/build.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.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/. -->
-
-<!--
-build.xml adapted from Shawn Wilsher's rtse
-(http://shawnwilsher.com/extensions/rtse/)
- -->
-
-<project name="pep" default="pepxpi">
-  <tstamp>
-    <format property="build.number" pattern="yyyyMMdd" offset="-1" unit="hour"/>
-  </tstamp>
-  <property name="build.version" value="1.1.${build.number}"/>
-
-  <target name="pepxpi" depends="createjar">
-    <delete file="pep.xpi"/>
-    <zip destfile="pep.xpi">
-      <zipfileset dir="" includes="jar/pep.jar"/>
-      <zipfileset dir="" includes="install.rdf"/>
-      <zipfileset dir="" includes="README"/>
-      <zipfileset dir="" includes="chrome-jar.manifest" fullpath="chrome.manifest"/>
-    </zip>
-    <antcall target="cleanup"/>
-  </target>
-
-  <target name="createjar">
-    <mkdir dir="jar"/>
-    <zip destfile="jar/pep.jar">
-      <zipfileset dir="" includes="components/**" excludes="**GIT"/>
-      <zipfileset dir="" includes="chrome/**" excludes="**GIT"/>
-      <zipfileset dir="" includes="resource/**" excludes="**GIT"/>
-      <zipfileset dir="" includes="locale/**" excludes="**GIT"/>
-      <zipfileset dir="" includes="skin/**" excludes="**GIT"/>
-    </zip>
-  </target>
-
-  <target name="unpacked">
-    <delete file="pep.xpi"/>
-    <zip destfile="pep.xpi">
-      <zipfileset dir="" includes="components/**" excludes="**GIT"/>
-      <zipfileset dir="" includes="chrome/**" excludes="**GIT"/>
-      <zipfileset dir="" includes="resource/**" excludes="**GIT"/>
-      <zipfileset dir="" includes="locale/**" excludes="**GIT"/>
-      <zipfileset dir="" includes="skin/**" excludes="**GIT"/>
-      <zipfileset dir="" includes="install.rdf"/>
-      <zipfileset dir="" includes="readme.txt"/>
-      <zipfileset dir="" includes="chrome.manifest" fullpath="chrome.manifest"/>
-    </zip>
-  </target>
-
-  <target name="cleanup">
-    <!-- Delete the chrome directory, any other cleanup actions go here -->
-    <delete dir="jar"/>
-  </target>
-</project>

deleted file mode 100644
--- a/testing/peptest/peptest/extension/chrome.manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-resource mozmill resource/mozmill/
-resource stdlib resource/stdlib/
-resource pep resource/pep/
-content pep chrome/content/
-locale	pep en-US	locale/en-US/
-skin	pep classic/1.0	skin/
-
-style	chrome://global/content/customizeToolbar.xul	chrome://pep/skin/overlay.css
-
-component {807b1ae9-df22-40bd-8d0a-2a583da551bb} components/pep-cmdline.js
-contract @mozilla.org/commandlinehandler/general-startup;1?type=pep {807b1ae9-df22-40bd-8d0a-2a583da551bb}
-category command-line-handler m-pep @mozilla.org/commandlinehandler/general-startup;1?type=pep
-
-overlay chrome://browser/content/browser.xul chrome://pep/content/overlay.xul

deleted file mode 100644
--- a/testing/peptest/peptest/extension/chrome/content/init.js
+++ /dev/null
@@ -1,78 +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/. */
-
-const cmdLineHandler =
-        Cc["@mozilla.org/commandlinehandler/general-startup;1?type=pep"]
-        .getService(Ci.nsICommandLineHandler);
-
-
-var log = {};       // basic logger
-var utils = {};     // utility object
-var broker = {};    // mozmill message broker for listening to mozmill events
-// test suite object that will run the tests
-Components.utils.import('resource://pep/testsuite.js');
-Components.utils.import('resource://pep/logger.js', log);
-Components.utils.import('resource://pep/utils.js', utils);
-Components.utils.import('resource://mozmill/driver/msgbroker.js', broker);
-
-var APPCONTENT;
-
-/**
- * This is the entry point for peptest.
- * Gets called when the browser is first loaded.
- */
-function initialize() {
-  window.removeEventListener("load", initialize, false);
-  let cmd = cmdLineHandler.wrappedJSObject;
-  // cmd.firstRun is used so the tests don't
-  // get run again if a second window is opened
-  if (cmd.firstRun) {
-    cmd.firstRun = false;
-    try {
-      // get json manifest object
-      let manifest = cmd.manifest;
-      let data = utils.readFile(manifest);
-      let obj = JSON.parse(data.join(' '));
-
-      // register mozmill listener
-      broker.addObject(new MozmillMsgListener());
-
-      // set a load listener on the content and run the tests when loaded
-      APPCONTENT = document.getElementById('appcontent');
-      function runTests() {
-        APPCONTENT.removeEventListener('pageshow', runTests);
-        suite = new TestSuite(obj.tests, obj.options);
-        suite.run();
-        goQuitApplication();
-      };
-      APPCONTENT.addEventListener('pageshow', runTests);
-    } catch(e) {
-      log.error(e.toString());
-      log.debug('Traceback:');
-      lines = e.stack.split('\n');
-      for (let i = 0; i < lines.length - 1; ++i) {
-        log.debug('\t' + lines[i]);
-      }
-      goQuitApplication();
-    }
-  }
-};
-
-/**
- * A listener to receive Mozmill events
- */
-function MozmillMsgListener() {}
-MozmillMsgListener.prototype.pass = function(obj) {
-  log.debug('MOZMILL pass ' + JSON.stringify(obj) + '\n');
-};
-MozmillMsgListener.prototype.fail = function(obj) {
-  // TODO Should this cause an error?
-  log.warning('MOZMILL fail ' + JSON.stringify(obj) + '\n');
-};
-MozmillMsgListener.prototype.log = function(obj) {
-  log.debug('MOZMILL log ' + JSON.stringify(obj) + '\n');
-};
-
-// register load listener for command line argument handling.
-window.addEventListener("load", initialize, false);

deleted file mode 100644
--- a/testing/peptest/peptest/extension/chrome/content/overlay.xul
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.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/. -->
-
-<?xml-stylesheet href="chrome://pep/skin/overlay.css" type="text/css"?>
-<!DOCTYPE overlay SYSTEM "chrome://pep/locale/overlay.dtd">
-<overlay id="pep-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/x-javascript" src="chrome://pep/content/quit.js"/>
-  <script type="application/x-javascript" src="chrome://pep/content/init.js"/>
-</overlay>

deleted file mode 100644
--- a/testing/peptest/peptest/extension/chrome/content/quit.js
+++ /dev/null
@@ -1,61 +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/. */
-
-/*
-From mozilla/toolkit/content
-These files did not have a license
-*/
-
-function canQuitApplication() {
-  var os = Components.classes["@mozilla.org/observer-service;1"]
-    .getService(Components.interfaces.nsIObserverService);
-  if (!os) {
-    return true;
-  }
-
-  try {
-    var cancelQuit = Components.classes["@mozilla.org/supports-PRBool;1"]
-      .createInstance(Components.interfaces.nsISupportsPRBool);
-    os.notifyObservers(cancelQuit, "quit-application-requested", null);
-
-    // Something aborted the quit process.
-    if (cancelQuit.data) {
-      return false;
-    }
-  }
-  catch (ex) {
-  }
-  return true;
-}
-
-function goQuitApplication() {
-  if (!canQuitApplication()) {
-    return false;
-  }
-
-  const kAppStartup = '@mozilla.org/toolkit/app-startup;1';
-  const kAppShell = '@mozilla.org/appshell/appShellService;1';
-  var appService;
-  var forceQuit;
-
-  if (kAppStartup in Components.classes) {
-    appService = Components.classes[kAppStartup].
-      getService(Components.interfaces.nsIAppStartup);
-    forceQuit = Components.interfaces.nsIAppStartup.eForceQuit;
-  } else if (kAppShell in Components.classes) {
-    appService = Components.classes[kAppShell].
-      getService(Components.interfaces.nsIAppShellService);
-    forceQuit = Components.interfaces.nsIAppShellService.eForceQuit;
-  } else {
-    throw 'goQuitApplication: no AppStartup/appShell';
-  }
-
-  try {
-    appService.quit(forceQuit);
-  }
-  catch(ex) {
-    throw('goQuitApplication: ' + ex);
-  }
-  return true;
-}

deleted file mode 100644
--- a/testing/peptest/peptest/extension/components/pep-cmdline.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/. */
-
-const PEP_CONTRACTID  = "@mozilla.org/commandlinehandler/general-startup;1?type=pep";
-const PEP_CID         = Components.ID('{807b1ae9-df22-40bd-8d0a-2a583da551bb}');
-const PEP_CATEGORY    = "m-pep";
-const PEP_DESCRIPTION = "Responsiveness Testing Harness";
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-// Command Line Handler
-function CommandLineHandler() {
-    this.wrappedJSObject = this;
-    this.firstRun = true;
-};
-
-CommandLineHandler.prototype = {
-  classID: PEP_CID,
-  classDescription: PEP_DESCRIPTION,
-  contractID: PEP_CONTRACTID,
-
-  QueryInterface: XPCOMUtils.generateQI([
-      Components.interfaces.nsISupports,
-      Components.interfaces.nsICommandLineHandler
-  ]),
-
-  _xpcom_categories: [{
-      category: "command-line-handler",
-      entry: PEP_CATEGORY,
-  }],
-
-  /* nsICommandLineHandler */
-  handle : function (cmdLine) {
-    try {
-      this.manifest = cmdLine.handleFlagWithParam("pep-start", false);
-      if (cmdLine.handleFlag("pep-noisy", false)) {
-        this.noisy = true;
-      }
-    }
-    catch (e) {
-      dump("incorrect parameter passed to pep on the command line.");
-      return;
-    }
-  },
-
-  helpInfo : "  -pep-start <file>    Run peptests described in given manifest\n" +
-             "  -pep-noisy           Dump debug messages to console during test run\n"
-};
-
-/**
-* XPCOMUtils.generateNSGetFactory was introduced in Mozilla 2 (Firefox 4).
-* XPCOMUtils.generateNSGetModule is for Mozilla 1.9.2 (Firefox 3.6).
-*/
-if (XPCOMUtils.generateNSGetFactory)
-    var NSGetFactory = XPCOMUtils.generateNSGetFactory([CommandLineHandler]);
-else
-    var NSGetModule = XPCOMUtils.generateNSGetModule([CommandLineHandler]);

deleted file mode 100644
--- a/testing/peptest/peptest/extension/install.rdf
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.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/. -->
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-   <Description about="urn:mozilla:install-manifest">
-     <em:id>pep@mozilla.com</em:id>
-     <em:name>Pep</em:name>
-     <em:version>1.0</em:version>
-     <em:creator>Andrew Halberstadt</em:creator>
-     <em:description>Harness for running responsiveness tests</em:description>
-     <em:targetApplication>
-       <!-- Firefox -->
-       <Description>
-         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-         <em:minVersion>3.6</em:minVersion>
-         <em:maxVersion>15.*</em:maxVersion>
-       </Description>
-     </em:targetApplication>
-     <em:targetApplication>
-       <!-- Thunderbird -->
-       <Description>
-         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-         <em:minVersion>3.0a1pre</em:minVersion>
-         <em:maxVersion>15.*</em:maxVersion>
-       </Description>
-     </em:targetApplication>
-   </Description>
-</RDF>

deleted file mode 100644
--- a/testing/peptest/peptest/extension/resource/mozmill/README.md
+++ /dev/null
@@ -1,9 +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/. -->
-
-These folders are pulled from:
-https://github.com/mozilla/mozmill/tree/master/mozmill/mozmill/extension/resource
-
-To update them, simply checkout the mozmill repo at https://github.com/mozilla/mozmill, 
-then copy and paste the 'driver' and 'stdlib' folders to this location. 

deleted file mode 100644
--- a/testing/peptest/peptest/extension/resource/mozmill/driver/controller.js
+++ /dev/null
@@ -1,1182 +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 EXPORTED_SYMBOLS = ["MozMillController", "globalEventRegistry",
-                        "sleep", "windowMap"];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-var EventUtils = {}; Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
-
-var broker = {}; Cu.import('resource://mozmill/driver/msgbroker.js', broker);
-var elementslib = {}; Cu.import('resource://mozmill/driver/elementslib.js', elementslib);
-var mozelement = {}; Cu.import('resource://mozmill/driver/mozelement.js', mozelement);
-var utils = {}; Cu.import('resource://mozmill/stdlib/utils.js', utils);
-
-var hwindow = Cc["@mozilla.org/appshell/appShellService;1"]
-              .getService(Ci.nsIAppShellService).hiddenDOMWindow;
-var aConsoleService = Cc["@mozilla.org/consoleservice;1"]
-                      .getService(Ci.nsIConsoleService);
-
-// Declare most used utils functions in the controller namespace
-var sleep = utils.sleep;
-var assert = utils.assert;
-var waitFor = utils.waitFor;
-
-
-// The window map which is used to store information e.g. loaded state of each
-// open chrome and content window.
-var windowMap = {
-  _windows : { },
-
-  /**
-   * Check if a given window id is contained in the map of windows
-   *
-   * @param {Number} aWindowId
-   *        Outer ID of the window to check.
-   * @returns {Boolean} True if the window is part of the map, otherwise false.
-   */
-  contains : function (aWindowId) {
-    return (aWindowId in this._windows);
-  },
-
-  /**
-   * Retrieve the value of the specified window's property.
-   *
-   * @param {Number} aWindowId
-   *        Outer ID of the window to check.
-   * @param {String} aProperty
-   *        Property to retrieve the value from
-   * @return {Object} Value of the window's property
-   */
-  getValue : function (aWindowId, aProperty) {
-    if (!this.contains(aWindowId)) {
-      return undefined;
-    } else {
-      var win = this._windows[aWindowId];
-
-      return (aProperty in win) ? win[aProperty]
-                                : undefined;
-    }
-  },
-
-  /**
-   * Remove the entry for a given window
-   *
-   * @param {Number} aWindowId
-   *        Outer ID of the window to check.
-   */
-  remove : function (aWindowId) {
-    if (this.contains(aWindowId))
-      delete this._windows[aWindowId];
-    //dump("* current map: " + JSON.stringify(this._windows) + "\n");
-  },
-
-  /**
-   * Update the property value of a given window
-   *
-   * @param {Number} aWindowId
-   *        Outer ID of the window to check.
-   * @param {String} aProperty
-   *        Property to update the value for
-   * @param {Object} 
-   *        Value to set
-   */
-  update : function (aWindowId, aProperty, aValue) {
-    if (!this.contains(aWindowId))
-      this._windows[aWindowId] = { };
-
-    this._windows[aWindowId][aProperty] = aValue;
-    //dump("* current map: " + JSON.stringify(this._windows) + "\n");
-  }
-}
-
-
-waitForEvents = function () {
-}
-
-waitForEvents.prototype = {
-  /**
-   * Initialize list of events for given node
-   */
-  init: function waitForEvents_init(node, events) {
-    if (node.getNode != undefined)
-      node = node.getNode();
-
-    this.events = events;
-    this.node = node;
-    node.firedEvents = {};
-    this.registry = {};
-
-    for each (var e in events) {
-      var listener = function (event) {
-        this.firedEvents[event.type] = true;
-      }
-
-      this.registry[e] = listener;
-      this.registry[e].result = false;
-      this.node.addEventListener(e, this.registry[e], true);
-    }
-  },
-
-  /**
-   * Wait until all assigned events have been fired
-   */
-  wait: function waitForEvents_wait(timeout, interval) {
-    for (var e in this.registry) {
-      utils.waitFor(function () {
-        return this.node.firedEvents[e] == true;
-      }, "Timeout happened before event '" + ex +"' was fired.", timeout, interval);
-
-      this.node.removeEventListener(e, this.registry[e], true);
-    }
-  }
-}
-
-/**
- * Class to handle menus and context menus
- *
- * @constructor
- * @param {MozMillController} controller
- *        Mozmill controller of the window under test
- * @param {string} menuSelector
- *        jQuery like selector string of the element
- * @param {object} document
- *        Document to use for finding the menu
- *        [optional - default: aController.window.document]
- */
-var Menu = function (controller, menuSelector, document) {
-  this._controller = controller;
-  this._menu = null;
-
-  document = document || controller.window.document;
-  var node = document.querySelector(menuSelector);
-  if (node) {
-    // We don't unwrap nodes automatically yet (Bug 573185)
-    node = node.wrappedJSObject || node;
-    this._menu = new mozelement.Elem(node);
-  } else {
-    throw new Error("Menu element '" + menuSelector + "' not found.");
-  }
-}
-
-Menu.prototype = {
-
-  /**
-   * Open and populate the menu
-   *
-   * @param {ElemBase} contextElement
-   *        Element whose context menu has to be opened
-   * @returns {Menu} The Menu instance
-   */
-  open: function Menu_open(contextElement) {
-    // We have to open the context menu
-    var menu = this._menu.getNode();
-    if ((menu.localName == "popup" || menu.localName == "menupopup") &&
-        contextElement && contextElement.exists()) {
-      this._controller.rightClick(contextElement);
-      this._controller.waitFor(function () {
-        return menu.state == "open";
-      }, "Context menu has been opened.");
-    }
-
-    // Run through the entire menu and populate with dynamic entries
-    this._buildMenu(menu);
-
-    return this;
-  },
-
-  /**
-   * Close the menu
-   *
-   * @returns {Menu} The Menu instance
-   */
-  close: function Menu_close() {
-    var menu = this._menu.getNode();
-
-    this._controller.keypress(this._menu, "VK_ESCAPE", {});
-    this._controller.waitFor(function () {
-      return menu.state == "closed";
-    }, "Context menu has been closed.");
-
-    return this;
-  },
-
-  /**
-   * Retrieve the specified menu entry
-   *
-   * @param {string} itemSelector
-   *        jQuery like selector string of the menu item
-   * @returns {ElemBase} Menu element
-   * @throws Error If menu element has not been found
-   */
-  getItem: function Menu_getItem(itemSelector) {
-    var node = this._menu.getNode().querySelector(itemSelector);
-
-    if (!node) {
-      throw new Error("Menu entry '" + itemSelector + "' not found.");
-    }
-
-    return new mozelement.Elem(node);
-  },
-
-  /**
-   * Click the specified menu entry
-   *
-   * @param {string} itemSelector
-   *        jQuery like selector string of the menu item
-   *
-   * @returns {Menu} The Menu instance
-   */
-  click: function Menu_click(itemSelector) {
-    this._controller.click(this.getItem(itemSelector));
-
-    return this;
-  },
-
-  /**
-   * Synthesize a keypress against the menu
-   *
-   * @param {string} key
-   *        Key to press
-   * @param {object} modifier
-   *        Key modifiers
-   * @see MozMillController#keypress
-   *
-   * @returns {Menu} The Menu instance
-   */
-  keypress: function Menu_keypress(key, modifier) {
-    this._controller.keypress(this._menu, key, modifier);
-
-    return this;
-  },
-
-  /**
-   * Opens the context menu, click the specified entry and
-   * make sure that the menu has been closed.
-   *
-   * @param {string} itemSelector
-   *        jQuery like selector string of the element
-   * @param {ElemBase} contextElement
-   *        Element whose context menu has to be opened
-   *
-   * @returns {Menu} The Menu instance
-   */
-  select: function Menu_select(itemSelector, contextElement) {
-    this.open(contextElement);
-    this.click(itemSelector);
-    this.close();
-  },
-
-  /**
-   * Recursive function which iterates through all menu elements and
-   * populates the menus with dynamic menu entries.
-   *
-   * @param {node} menu
-   *        Top menu node whose elements have to be populated
-   */
-  _buildMenu: function Menu__buildMenu(menu) {
-    var items = menu ? menu.childNodes : null;
-
-    Array.forEach(items, function (item) {
-      // When we have a menu node, fake a click onto it to populate
-      // the sub menu with dynamic entries
-      if (item.tagName == "menu") {
-        var popup = item.querySelector("menupopup");
-
-        if (popup) {
-          if (popup.allowevents) {
-            var popupEvent = this._controller.window.document.createEvent("MouseEvent");
-            popupEvent.initMouseEvent("popupshowing", true, true,
-                                      this._controller.window, 0, 0, 0, 0, 0,
-                                      false, false, false, false, 0, null);
-            popup.dispatchEvent(popupEvent);
-          }
-
-          this._buildMenu(popup);
-        }
-      }
-    }, this);
-  }
-};
-
-var MozMillController = function (window) {
-  this.window = window;
-
-  this.mozmillModule = {};
-  Cu.import('resource://mozmill/driver/mozmill.js', this.mozmillModule);
-
-  utils.waitFor(function () {
-    return window != null && this.isLoaded();
-  }, "controller(): Window could not be initialized.", undefined, undefined, this);
-
-  var windowType = window.document.documentElement.getAttribute('windowtype');
-  if (controllerAdditions[windowType] != undefined ) {
-    this.prototype = new utils.Copy(this.prototype);
-    controllerAdditions[windowType](this);
-    this.windowtype = windowType;
-  }
-}
-
-// constructs a MozMillElement from the controller's window
-MozMillController.prototype.__defineGetter__("rootElement", function () {
-  if (this._rootElement == undefined) {
-    this._rootElement = new mozelement.MozMillElement(undefined, undefined,
-                                                      {'element': this.window.document.documentElement});
-  }
-
-  return this._rootElement;
-});
-
-MozMillController.prototype.sleep = utils.sleep;
-
-// Open the specified url in the current tab
-MozMillController.prototype.open = function (url) {
-  switch (this.mozmillModule.Application) {
-    case "Firefox":
-    case "SeaMonkey":
-      this.window.getBrowser().loadURI(url);
-      break;
-    default:
-      throw new Error("MozMillController.open not supported.");
-  }
-
-  broker.pass({'function':'Controller.open()'});
-}
-
-/**
- * Take a screenshot of specified node
- * 
- * @param {element} node
- *   the window or DOM element to capture
- * @param {string} name
- *   the name of the screenshot used in reporting and as filename
- * @param {boolean} save
- *   if true saves the screenshot as 'name.png' in tempdir, otherwise returns a dataURL
- * @param {element list} highlights
- *   a list of DOM elements to highlight by drawing a red rectangle around them
- */
-MozMillController.prototype.screenShot = function _screenShot(node, name, save, highlights) {
-  if (!node) {
-    throw new Error("node is undefined");
-  }
-
-  // Unwrap the node and highlights
-  if ("getNode" in node) {
-    node = node.getNode();
-  }
-
-  if (highlights) {
-    for (var i = 0; i < highlights.length; ++i) {
-      if ("getNode" in highlights[i]) {
-        highlights[i] = highlights[i].getNode();
-      }
-    }
-  }
-
-  // If save is false, a dataURL is used
-  // Include both in the report anyway to avoid confusion and make the report easier to parse
-  var filepath, dataURL;
-  try {
-    if (save) {
-      filepath = utils.takeScreenshot(node, name, highlights);
-    } else {
-      dataURL = utils.takeScreenshot(node, undefined, highlights);
-    }
-  } catch (e) {
-    throw new Error("controller.screenShot() failed: " + e);
-  }
-
-  // Report object
-  var obj = {"filepath": filepath,
-             "dataURL": dataURL,
-             "name": name,
-             "timestamp": new Date().toLocaleString()};
-
-  // Send the screenshot object to python over jsbridge
-  broker.sendMessage("screenShot", obj);
-  broker.pass({'function': 'controller.screenShot()'});
-}
-
-/**
- * Checks if the specified window has been loaded
- *
- * @param {DOMWindow} [aWindow=this.window] Window object to check for loaded state
- */
-MozMillController.prototype.isLoaded = function (aWindow) {
-  var win = aWindow || this.window;
-
-  var id = utils.getWindowId(win);
-  return windowMap.contains(id) && windowMap.getValue(id, "loaded");
-};
-
-MozMillController.prototype.waitFor = function (callback, message, timeout,
-                                                interval, thisObject) {
-  utils.waitFor(callback, message, timeout, interval, thisObject);
-  broker.pass({'function':'controller.waitFor()'});
-}
-
-MozMillController.prototype.__defineGetter__("waitForEvents", function () {
-  if (this._waitForEvents == undefined) {
-    this._waitForEvents = new waitForEvents();
-  }
-
-  return this._waitForEvents;
-});
-
-/**
- * Wrapper function to create a new instance of a menu
- * @see Menu
- */
-MozMillController.prototype.getMenu = function (menuSelector, document) {
-  return new Menu(this, menuSelector, document);
-};
-
-MozMillController.prototype.__defineGetter__("mainMenu", function () {
-  return this.getMenu("menubar");
-});
-
-MozMillController.prototype.__defineGetter__("menus", function () {
-  logDeprecated('controller.menus', 'Use controller.mainMenu instead');
-});
-
-MozMillController.prototype.waitForImage = function (elem, timeout, interval) {
-  this.waitFor(function () {
-    return elem.getNode().complete == true;
-  }, "timeout exceeded for waitForImage " + elem.getInfo(), timeout, interval);
-
-  broker.pass({'function':'Controller.waitForImage()'});
-}
-
-MozMillController.prototype.startUserShutdown = function (timeout, restart, next, resetProfile) {
-  if (restart && resetProfile) {
-    throw new Error("You can't have a user-restart and reset the profile; there is a race condition");
-  }
-
-  broker.sendMessage('userShutdown', {'user': true,
-                                      'restart': Boolean(restart),
-                                      'next': next,
-                                      'resetProfile': Boolean(resetProfile)});
-  this.window.setTimeout(broker.sendMessage, timeout, 'userShutdown', 0);
-}
-
-MozMillController.prototype.restartApplication = function (next, resetProfile) {
-  // restart the application via the python runner
-  // - next : name of the next test function to run after restart
-  // - resetProfile : whether to reset the profile after restart
-  broker.sendMessage('userShutdown', {'user': false,
-                                      'restart': true,
-                                      'next': next,
-                                      'resetProfile': Boolean(resetProfile)});
-  broker.sendMessage('endTest');
-  broker.sendMessage('persist');
-  utils.getMethodInWindows('goQuitApplication')();
-}
-
-MozMillController.prototype.stopApplication = function (resetProfile) {
-  // stop the application via the python runner
-  // - resetProfile : whether to reset the profile after shutdown
-  broker.sendMessage('userShutdown', {'user': false,
-                                      'restart': false,
-                                      'resetProfile': Boolean(resetProfile)});
-  broker.sendMessage('endTest');
-  broker.sendMessage('persist');
-  utils.getMethodInWindows('goQuitApplication')();
-}
-
-//Browser navigation functions
-MozMillController.prototype.goBack = function () {
-  this.window.content.history.back();
-  broker.pass({'function':'Controller.goBack()'});
-
-  return true;
-}
-
-MozMillController.prototype.goForward = function () {
-  this.window.content.history.forward();
-  broker.pass({'function':'Controller.goForward()'});
-
-  return true;
-}
-
-MozMillController.prototype.refresh = function () {
-  this.window.content.location.reload(true);
-  broker.pass({'function':'Controller.refresh()'});
-
-  return true;
-}
-
-function logDeprecated(funcName, message) {
-  broker.log({'function': funcName + '() - DEPRECATED',
-              'message': funcName + '() is deprecated. ' + message});
-}
-
-function logDeprecatedAssert(funcName) {
-   logDeprecated('controller.' + funcName,
-                 '. Use the generic `assertion` module instead.');
-}
-
-MozMillController.prototype.assertText = function (el, text) {
-  logDeprecatedAssert("assertText");
-
-  var n = el.getNode();
-
-  if (n && n.innerHTML == text) {
-    broker.pass({'function': 'Controller.assertText()'});
-  } else {
-    throw new Error("could not validate element " + el.getInfo() +
-                    " with text "+ text);
-  }
-
-  return true;
-};
-
-/**
- * Assert that a specified node exists
- */
-MozMillController.prototype.assertNode = function (el) {
-  logDeprecatedAssert("assertNode");
-
-  //this.window.focus();
-  var element = el.getNode();
-  if (!element) {
-    throw new Error("could not find element " + el.getInfo());
-  }
-
-  broker.pass({'function': 'Controller.assertNode()'});
-  return true;
-};
-
-/**
- * Assert that a specified node doesn't exist
- */
-MozMillController.prototype.assertNodeNotExist = function (el) {
-  logDeprecatedAssert("assertNodeNotExist");
-
-  try {
-    var element = el.getNode();
-  } catch (e) {
-    broker.pass({'function': 'Controller.assertNodeNotExist()'});
-  }
-
-  if (element) {
-    throw new Error("Unexpectedly found element " + el.getInfo());
-  } else {
-    broker.pass({'function':'Controller.assertNodeNotExist()'});
-  }
-
-  return true;
-};
-
-/**
- * Assert that a form element contains the expected value
- */
-MozMillController.prototype.assertValue = function (el, value) {
-  logDeprecatedAssert("assertValue");
-
-  var n = el.getNode();
-
-  if (n && n.value == value) {
-    broker.pass({'function': 'Controller.assertValue()'});
-  } else {
-    throw new Error("could not validate element " + el.getInfo() +
-                    " with value " + value);
-  }
-
-  return false;
-};
-
-/**
- * Check if the callback function evaluates to true
- */
-MozMillController.prototype.assert = function (callback, message, thisObject) {
-  logDeprecatedAssert("assert");
-
-  utils.assert(callback, message, thisObject);
-  broker.pass({'function': ": controller.assert('" + callback + "')"});
-
-  return true;
-}
-
-/**
- * Assert that a provided value is selected in a select element
- */
-MozMillController.prototype.assertSelected = function (el, value) {
-  logDeprecatedAssert("assertSelected");
-
-  var n = el.getNode();
-  var validator = value;
-
-  if (n && n.options[n.selectedIndex].value == validator) {
-    broker.pass({'function':'Controller.assertSelected()'});
-  } else {
-    throw new Error("could not assert value for element " + el.getInfo() +
-                    " with value " + value);
-  }
-
-  return true;
-};
-
-/**
- * Assert that a provided checkbox is checked
- */
-MozMillController.prototype.assertChecked = function (el) {
-  logDeprecatedAssert("assertChecked");
-
-  var element = el.getNode();
-
-  if (element && element.checked == true) {
-    broker.pass({'function':'Controller.assertChecked()'});
-  } else {
-    throw new Error("assert failed for checked element " + el.getInfo());
-  }
-
-  return true;
-};
-
-/**
- * Assert that a provided checkbox is not checked
- */
-MozMillController.prototype.assertNotChecked = function (el) {
-  logDeprecatedAssert("assertNotChecked");
-
-  var element = el.getNode();
-
-  if (!element) {
-    throw new Error("Could not find element" + el.getInfo());
-  }
-
-  if (!element.hasAttribute("checked") || element.checked != true) {
-    broker.pass({'function': 'Controller.assertNotChecked()'});
-  } else {
-    throw new Error("assert failed for not checked element " + el.getInfo());
-  }
-
-  return true;
-};
-
-/**
- * Assert that an element's javascript property exists or has a particular value
- *
- * if val is undefined, will return true if the property exists.
- * if val is specified, will return true if the property exists and has the correct value
- */
-MozMillController.prototype.assertJSProperty = function (el, attrib, val) {
-  logDeprecatedAssert("assertJSProperty");
-
-  var element = el.getNode();
-
-  if (!element){
-    throw new Error("could not find element " + el.getInfo());
-  }
-
-  var value = element[attrib];
-  var res = (value !== undefined && (val === undefined ? true :
-                                                         String(value) == String(val)));
-  if (res) {
-    broker.pass({'function':'Controller.assertJSProperty("' + el.getInfo() + '") : ' + val});
-  } else {
-    throw new Error("Controller.assertJSProperty(" + el.getInfo() + ") : " + 
-                    (val === undefined ? "property '" + attrib +
-                    "' doesn't exist" : val + " == " + value));
-  }
-
-  return true;
-};
-
-/** 
- * Assert that an element's javascript property doesn't exist or doesn't have a particular value
- *
- * if val is undefined, will return true if the property doesn't exist.
- * if val is specified, will return true if the property doesn't exist or doesn't have the specified value
- */
-MozMillController.prototype.assertNotJSProperty = function (el, attrib, val) {
-  logDeprecatedAssert("assertNotJSProperty");
-
-  var element = el.getNode();
-
-  if (!element){
-    throw new Error("could not find element " + el.getInfo());
-  }
-
-  var value = element[attrib];
-  var res = (val === undefined ? value === undefined : String(value) != String(val));
-  if (res) {
-    broker.pass({'function':'Controller.assertNotProperty("' + el.getInfo() + '") : ' + val});
-  } else {
-    throw new Error("Controller.assertNotJSProperty(" + el.getInfo() + ") : " +
-                    (val === undefined ? "property '" + attrib +
-                    "' exists" : val + " != " + value));
-  }
-
-  return true;
-};
-
-/** 
- * Assert that an element's dom property exists or has a particular value
- *
- * if val is undefined, will return true if the property exists.
- * if val is specified, will return true if the property exists and has the correct value
- */
-MozMillController.prototype.assertDOMProperty = function (el, attrib, val) {
-  logDeprecatedAssert("assertDOMProperty");
-
-  var element = el.getNode();
-
-  if (!element){
-    throw new Error("could not find element " + el.getInfo());
-  }
-
-  var value, res = element.hasAttribute(attrib);
-  if (res && val !== undefined) {
-    value = element.getAttribute(attrib);
-    res = (String(value) == String(val));
-  }
-
-  if (res) {
-    broker.pass({'function':'Controller.assertDOMProperty("' + el.getInfo() + '") : ' + val});
-  } else {
-    throw new Error("Controller.assertDOMProperty(" + el.getInfo() + ") : " +
-                    (val === undefined ? "property '" + attrib +
-                    "' doesn't exist" : val + " == " + value));
-  }
-
-  return true;
-};
-
-/**
- * Assert that an element's dom property doesn't exist or doesn't have a particular value
- *
- * if val is undefined, will return true if the property doesn't exist.
- * if val is specified, will return true if the property doesn't exist or doesn't have the specified value
- */
-MozMillController.prototype.assertNotDOMProperty = function (el, attrib, val) {
-  logDeprecatedAssert("assertNotDOMProperty");
-
-  var element = el.getNode();
-
-  if (!element) {
-    throw new Error("could not find element " + el.getInfo());
-  }
-
-  var value, res = element.hasAttribute(attrib);
-  if (res && val !== undefined) {
-    value = element.getAttribute(attrib);
-    res = (String(value) == String(val));
-  }
-
-  if (!res) {
-    broker.pass({'function':'Controller.assertNotDOMProperty("' + el.getInfo() + '") : ' + val});
-  } else {
-    throw new Error("Controller.assertNotDOMProperty(" + el.getInfo() + ") : " + 
-                    (val == undefined ? "property '" + attrib +
-                    "' exists" : val + " == " + value));
-  }
-
-  return true;
-};
-
-/**
- * Assert that a specified image has actually loaded. The Safari workaround results
- * in additional requests for broken images (in Safari only) but works reliably
- */
-MozMillController.prototype.assertImageLoaded = function (el) {
-  logDeprecatedAssert("assertImageLoaded");
-
-  var img = el.getNode();
-
-  if (!img || img.tagName != 'IMG') {
-    throw new Error('Controller.assertImageLoaded() failed.')
-    return false;
-  }
-
-  var comp = img.complete;
-  var ret = null; // Return value
-
-  // Workaround for Safari -- it only supports the
-  // complete attrib on script-created images
-  if (typeof comp == 'undefined') {
-    test = new Image();
-    // If the original image was successfully loaded,
-    // src for new one should be pulled from cache
-    test.src = img.src;
-    comp = test.complete;
-  }
-
-  // Check the complete attrib. Note the strict
-  // equality check -- we don't want undefined, null, etc.
-  // --------------------------
-  if (comp === false) {
-    // False -- Img failed to load in IE/Safari, or is
-    // still trying to load in FF
-    ret = false;
-  } else if (comp === true && img.naturalWidth == 0) {
-    // True, but image has no size -- image failed to
-    // load in FF
-    ret = false;
-  } else {
-    // Otherwise all we can do is assume everything's
-    // hunky-dory
-   ret = true;
-  }
-
-  if (ret) {
-    broker.pass({'function':'Controller.assertImageLoaded'});
-  } else {
-    throw new Error('Controller.assertImageLoaded() failed.')
-  }
-
-  return true;
-};
-
-/**
- * Drag one element to the top x,y coords of another specified element
- */
-MozMillController.prototype.mouseMove = function (doc, start, dest) {
-  // if one of these elements couldn't be looked up
-  if (typeof start != 'object'){
-    throw new Error("received bad coordinates");
-  }
-
-  if (typeof dest != 'object'){
-    throw new Error("received bad coordinates");
-  }
-
-  var triggerMouseEvent = function (element, clientX, clientY) {
-    clientX = clientX ? clientX: 0;
-    clientY = clientY ? clientY: 0;
-
-    // make the mouse understand where it is on the screen
-    var screenX = element.boxObject.screenX ? element.boxObject.screenX : 0;
-    var screenY = element.boxObject.screenY ? element.boxObject.screenY : 0;
-
-    var evt = element.ownerDocument.createEvent('MouseEvents');
-    if (evt.initMouseEvent) {
-      evt.initMouseEvent('mousemove', true, true, element.ownerDocument.defaultView,
-                         1, screenX, screenY, clientX, clientY);
-    } else {
-      evt.initEvent('mousemove', true, true);
-    }
-
-    element.dispatchEvent(evt);
-  };
-
-  // Do the initial move to the drag element position
-  triggerMouseEvent(doc.body, start[0], start[1]);
-  triggerMouseEvent(doc.body, dest[0], dest[1]);
-
-  broker.pass({'function':'Controller.mouseMove()'});
-  return true;
-}
-
-/**
- * Drag an element to the specified offset on another element, firing mouse and
- * drag events. Returns the captured dropEffect.
- * Adapted from EventUtils' synthesizeDrop()
- */
-MozMillController.prototype.dragToElement = function (src, dest, offsetX,
-                                                      offsetY, aWindow,
-                                                      dropEffect, dragData) {
-  srcElement = src.getNode();
-  destElement = dest.getNode();
-  aWindow = aWindow || srcElement.ownerDocument.defaultView;
-  offsetX = offsetX || 20;
-  offsetY = offsetY || 20;
-
-  var dataTransfer;
-
-  var trapDrag = function (event) {
-    dataTransfer = event.dataTransfer;
-    if (!dragData)
-      return;
-
-    for (var i = 0; i < dragData.length; i++) {
-      var item = dragData[i];
-      for (var j = 0; j < item.length; j++) {
-        dataTransfer.mozSetDataAt(item[j].type, item[j].data, i);
-      }
-    }
-
-    dataTransfer.dropEffect = dropEffect || "move";
-    event.preventDefault();
-    event.stopPropagation();
-  }
-
-  aWindow.addEventListener("dragstart", trapDrag, true);
-  // Fire mousedown 2 pixels from corner of element
-  EventUtils.synthesizeMouse(srcElement, 2, 2, { type: "mousedown" }, aWindow);
-  EventUtils.synthesizeMouse(srcElement, 11, 11, { type: "mousemove" }, aWindow);
-  EventUtils.synthesizeMouse(srcElement, offsetX, offsetY, { type: "mousemove" }, aWindow);
-  aWindow.removeEventListener("dragstart", trapDrag, true);
-
-  var event = aWindow.document.createEvent("DragEvents");
-  event.initDragEvent("dragenter", true, true, aWindow, 0, 0, 0, 0, 0,
-                      false, false, false, false, 0, null, dataTransfer);
-  destElement.dispatchEvent(event);
-
-  var event = aWindow.document.createEvent("DragEvents");
-  event.initDragEvent("dragover", true, true, aWindow, 0, 0, 0, 0, 0,
-                      false, false, false, false, 0, null, dataTransfer);
-  if (destElement.dispatchEvent(event)) {
-    EventUtils.synthesizeMouse(destElement, offsetX, offsetY, { type: "mouseup" }, aWindow);
-    return "none";
-  }
-
-  event = aWindow.document.createEvent("DragEvents");
-  event.initDragEvent("drop", true, true, aWindow, 0, 0, 0, 0, 0,
-                      false, false, false, false, 0, null, dataTransfer);
-  destElement.dispatchEvent(event);
-  EventUtils.synthesizeMouse(destElement, offsetX, offsetY, { type: "mouseup" }, aWindow);
-
-  return dataTransfer.dropEffect;
-}
-
-function preferencesAdditions(controller) {
-  var mainTabs = controller.window.document.getAnonymousElementByAttribute(controller.window.document.documentElement, 'anonid', 'selector');
-  controller.tabs = {};
-
-  for (var i = 0; i < mainTabs.childNodes.length; i++) {
-    var node  = mainTabs.childNodes[i];
-    var obj = {'button':node}
-    controller.tabs[i] = obj;
-    var label = node.attributes.item('label').value.replace('pane', '');
-    controller.tabs[label] = obj;
-  }
-
-  controller.prototype.__defineGetter__("activeTabButton", function () {
-    return mainTabs.getElementsByAttribute('selected', true)[0];
-  })
-}
-
-function Tabs(controller) {
-  this.controller = controller;
-}
-
-Tabs.prototype.getTab = function (index) {
-  return this.controller.window.getBrowser().browsers[index].contentDocument;
-}
-
-Tabs.prototype.__defineGetter__("activeTab", function () {
-  return this.controller.window.getBrowser().contentDocument;
-});
-
-Tabs.prototype.selectTab = function (index) {
-  // GO in to tab manager and grab the tab by index and call focus.
-}
-
-Tabs.prototype.findWindow = function (doc) {
-  for (var i = 0; i <= (this.controller.window.frames.length - 1); i++) {
-    if (this.controller.window.frames[i].document == doc) {
-      return this.controller.window.frames[i];
-    }
-  }
-
-  throw new Error("Cannot find window for document. Doc title == " + doc.title);
-}
-
-Tabs.prototype.getTabWindow = function (index) {
-  return this.findWindow(this.getTab(index));
-}
-
-Tabs.prototype.__defineGetter__("activeTabWindow", function () {
-  return this.findWindow(this.activeTab);
-});
-
-Tabs.prototype.__defineGetter__("length", function () {
-  return this.controller.window.getBrowser().browsers.length;
-});
-
-Tabs.prototype.__defineGetter__("activeTabIndex", function () {
-  return this.controller.window.getBrowser().tabContainer.selectedIndex;
-});
-
-Tabs.prototype.selectTabIndex = function (i) {
-  this.controller.window.getBrowser().selectTabAtIndex(i);
-}
-
-function browserAdditions (controller) {
-  controller.tabs = new Tabs(controller);
-
-  controller.waitForPageLoad = function (aDocument, aTimeout, aInterval) {
-    var timeout = aTimeout || 30000;
-    var win = null;
-
-    // If a user tries to do waitForPageLoad(2000), this will assign the
-    // interval the first arg which is most likely what they were expecting
-    if (typeof(aDocument) == "number"){
-      timeout = aDocument;
-    }
-
-    // If we have a real document use its default view
-    if (aDocument && (typeof(aDocument) === "object") &&
-        "defaultView" in aDocument)
-      win = aDocument.defaultView;
-
-    // If no document has been specified, fallback to the default view of the
-    // currently selected tab browser
-    win = win || this.window.getBrowser().contentWindow;
-
-    // Wait until the content in the tab has been loaded
-    this.waitFor(function () {
-      var loaded = this.isLoaded(win);
-      var firstRun = !('mozmillWaitForPageLoad' in win);
-      var ret = firstRun && loaded;
-
-      if (ret) {
-        win.mozmillWaitForPageLoad = true;
-      }
-
-      return ret;
-    }, "controller.waitForPageLoad(): Timeout waiting for page loaded.",
-        timeout, aInterval, this);
-
-    broker.pass({'function':'controller.waitForPageLoad()'});
-  }
-}
-
-var controllerAdditions = {
-  'Browser:Preferences':preferencesAdditions,
-  'navigator:browser'  :browserAdditions
-};
-
-/**
- *  DEPRECATION WARNING
- *
- * The following methods have all been DEPRECATED as of Mozmill 2.0
- */
-MozMillController.prototype.assertProperty = function (el, attrib, val) {
-  logDeprecatedAssert("assertProperty");
-
-  return this.assertJSProperty(el, attrib, val);
-};
-
-MozMillController.prototype.assertPropertyNotExist = function (el, attrib) {
-  logDeprecatedAssert("assertPropertyNotExist");
-  return this.assertNotJSProperty(el, attrib);
-};
-
-/**
- *  DEPRECATION WARNING
- *
- * The following methods have all been DEPRECATED as of Mozmill 2.0
- * Use the MozMillElement object instead (https://developer.mozilla.org/en/Mozmill/Mozmill_Element_Object)
- */
-MozMillController.prototype.select = function (elem, index, option, value) {
-  logDeprecated("controller.select", "Use the MozMillElement object.");
-
-  return elem.select(index, option, value); 
-};
-
-MozMillController.prototype.keypress = function (aTarget, aKey, aModifiers, aExpectedEvent) {
-  logDeprecated("controller.keypress", "Use the MozMillElement object.");
-
-  if (aTarget == null) {
-    aTarget = this.rootElement;
-  }
-
-  return aTarget.keypress(aKey, aModifiers, aExpectedEvent);
-}
-
-MozMillController.prototype.type = function (aTarget, aText, aExpectedEvent) {
-  logDeprecated("controller.type", "Use the MozMillElement object.");
-
-  if (aTarget == null) {
-    aTarget = this.rootElement;
-  }
-
-  var that = this;
-  var retval = true;
-  Array.forEach(aText, function (letter) {
-    if (!that.keypress(aTarget, letter, {}, aExpectedEvent)) {
-      retval = false; }
-  });
-
-  return retval;
-}
-
-MozMillController.prototype.mouseEvent = function (aTarget, aOffsetX, aOffsetY, aEvent, aExpectedEvent) {
-  logDeprecated("controller.mouseEvent", "Use the MozMillElement object.");
-
-  return aTarget.mouseEvent(aOffsetX, aOffsetY, aEvent, aExpectedEvent);
-}
-
-MozMillController.prototype.click = function (elem, left, top, expectedEvent) {
-  logDeprecated("controller.click", "Use the MozMillElement object.");
-
-  return elem.click(left, top, expectedEvent);
-}
-
-MozMillController.prototype.doubleClick = function (elem, left, top, expectedEvent) {
-  logDeprecated("controller.doubleClick", "Use the MozMillElement object.");
-
-  return elem.doubleClick(left, top, expectedEvent);
-}
-
-MozMillController.prototype.mouseDown = function (elem, button, left, top, expectedEvent) {
-  logDeprecated("controller.mouseDown", "Use the MozMillElement object.");
-
-  return elem.mouseDown(button, left, top, expectedEvent);
-};
-
-MozMillController.prototype.mouseOut = function (elem, button, left, top, expectedEvent) {
-  logDeprecated("controller.mouseOut", "Use the MozMillElement object.");
-
-  return elem.mouseOut(button, left, top, expectedEvent);
-};
-
-MozMillController.prototype.mouseOver = function (elem, button, left, top, expectedEvent) {
-  logDeprecated("controller.mouseOver", "Use the MozMillElement object.");
-
-  return elem.mouseOver(button, left, top, expectedEvent);
-};
-
-MozMillController.prototype.mouseUp = function (elem, button, left, top, expectedEvent) {
-  logDeprecated("controller.mouseUp", "Use the MozMillElement object.");
-
-  return elem.mouseUp(button, left, top, expectedEvent);
-};
-
-MozMillController.prototype.middleClick = function (elem, left, top, expectedEvent) {
-  logDeprecated("controller.middleClick", "Use the MozMillElement object.");
-
-  return elem.middleClick(elem, left, top, expectedEvent);
-}
-
-MozMillController.prototype.rightClick = function (elem, left, top, expectedEvent) {
-  logDeprecated("controller.rightClick", "Use the MozMillElement object.");
-
-  return elem.rightClick(left, top, expectedEvent);
-}
-
-MozMillController.prototype.check = function (elem, state) {
-  logDeprecated("controller.check", "Use the MozMillElement object.");
-
-  return elem.check(state);
-}
-
-MozMillController.prototype.radio = function (elem) {
-  logDeprecated("controller.radio", "Use the MozMillElement object.");
-
-  return elem.select();
-}
-
-MozMillController.prototype.waitThenClick = function (elem, timeout, interval) {
-  logDeprecated("controller.waitThenClick", "Use the MozMillElement object.");
-
-  return elem.waitThenClick(timeout, interval);
-}
-
-MozMillController.prototype.waitForElement = function (elem, timeout, interval) {
-  logDeprecated("controller.waitForElement", "Use the MozMillElement object.");
-
-  return elem.waitForElement(timeout, interval);
-}
-
-MozMillController.prototype.waitForElementNotPresent = function (elem, timeout, interval) {
-  logDeprecated("controller.waitForElementNotPresent", "Use the MozMillElement object.");
-
-  return elem.waitForElementNotPresent(timeout, interval);
-}

deleted file mode 100644
--- a/testing/peptest/peptest/extension/resource/mozmill/driver/elementslib.js
+++ /dev/null
@@ -1,525 +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 EXPORTED_SYMBOLS = ["Elem", "ID", "Link", "XPath", "Selector", "Name", "Anon", "AnonXPath",
-                        "Lookup", "_byID", "_byName", "_byAttrib", "_byAnonAttrib",
-                       ];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-var utils = {}; Cu.import('resource://mozmill/stdlib/utils.js', utils);
-var strings = {}; Cu.import('resource://mozmill/stdlib/strings.js', strings);
-var arrays = {}; Cu.import('resource://mozmill/stdlib/arrays.js', arrays);
-var json2 = {}; Cu.import('resource://mozmill/stdlib/json2.js', json2);
-var withs = {}; Cu.import('resource://mozmill/stdlib/withs.js', withs);
-var dom = {}; Cu.import('resource://mozmill/stdlib/dom.js', dom);
-var objects = {}; Cu.import('resource://mozmill/stdlib/objects.js', objects);
-
-var countQuotes = function (str) {
-  var count = 0;
-  var i = 0;
-
-  while (i < str.length) {
-    i = str.indexOf('"', i);
-    if (i != -1) {
-      count++;
-      i++;
-    } else {
-      break;
-    }
-  }
-
-  return count;
-};
-
-/**
- * smartSplit()
- *
- * Takes a lookup string as input and returns
- * a list of each node in the string
- */
-var smartSplit = function (str) {
-  // Ensure we have an even number of quotes
-  if (countQuotes(str) % 2 != 0) {
-    throw new Error ("Invalid Lookup Expression");
-  }
-
-  /**
-   * This regex matches a single "node" in a lookup string.
-   * In otherwords, it matches the part between the two '/'s
-   *
-   * Regex Explanation:
-   * \/ - start matching at the first forward slash
-   * ([^\/"]*"[^"]*")* - match as many pairs of quotes as possible until we hit a slash (ignore slashes inside quotes)
-   * [^\/]* - match the remainder of text outside of last quote but before next slash
-   */
-  var re = /\/([^\/"]*"[^"]*")*[^\/]*/g
-  var ret = []
-  var match = re.exec(str);
-
-  while (match != null) {
-    ret.push(match[0].replace(/^\//, ""));
-    match = re.exec(str);
-  }
-
-  return ret;
-};
-
-/**
- * defaultDocuments()
- *
- * Returns a list of default documents in which to search for elements
- * if no document is provided
- */
-function defaultDocuments() {
-  var win = Cc['@mozilla.org/appshell/window-mediator;1']
-            .getService(Ci.nsIWindowMediator)
-            .getMostRecentWindow("navigator:browser");
-
-  return [win.getBrowser().contentDocument, win.document];
-};
-
-/**
- * nodeSearch()
- *
- * Takes an optional document, callback and locator string
- * Returns a handle to the located element or null
- */
-function nodeSearch(doc, func, string) {
-  if (doc != undefined) {
-    var documents = [doc];
-  } else {
-    var documents = defaultDocuments();
-  }
-
-  var e = null;
-  var element = null;
-
-  //inline function to recursively find the element in the DOM, cross frame.
-  var search = function (win, func, string) {
-    if (win == null) {
-      return;
-    }
-
-    //do the lookup in the current window
-    element = func.call(win, string);
-
-    if (!element || (element.length == 0)) {
-      var frames = win.frames;
-      for (var i = 0; i < frames.length; i++) {
-        search(frames[i], func, string);
-      }
-    } else {
-      e = element;
-    }
-  };
-
-  for (var i = 0; i < documents.length; ++i) {
-    var win = documents[i].defaultView;
-    search(win, func, string);
-    if (e) {
-      break;
-    }
-  }
-
-  return e;
-};
-
-/**
- * Selector()
- *
- * Finds an element by selector string
- */
-function Selector(_document, selector, index) {
-  if (selector == undefined) {
-    throw new Error('Selector constructor did not recieve enough arguments.');
-  }
-
-  this.selector = selector;
-
-  this.getNodeForDocument = function (s) {
-    return this.document.querySelectorAll(s);
-  };
-
-  var nodes = nodeSearch(_document, this.getNodeForDocument, this.selector);
-
-  return nodes ? nodes[index || 0] : null;
-};
-
-/**
- * ID()
- *
- * Finds an element by ID
- */
-function ID(_document, nodeID) {
-  if (nodeID == undefined) {
-    throw new Error('ID constructor did not recieve enough arguments.');
-  }
-
-  this.getNodeForDocument = function (nodeID) {
-    return this.document.getElementById(nodeID);
-  };
-
-  return nodeSearch(_document, this.getNodeForDocument, nodeID);
-};
-
-/**
- * Link()
- *
- * Finds a link by innerHTML
- */
-function Link(_document, linkName) {
-  if (linkName == undefined) {
-    throw new Error('Link constructor did not recieve enough arguments.');
-  }
-
-  this.getNodeForDocument = function (linkName) {
-    var getText = function (el) {
-      var text = "";
-
-      if (el.nodeType == 3) { //textNode
-        if (el.data != undefined) {
-          text = el.data;
-        } else {
-          text = el.innerHTML;
-        }
-
-        text = text.replace(/n|r|t/g, " ");
-      }
-      else if (el.nodeType == 1) { //elementNode
-        for (var i = 0; i < el.childNodes.length; i++) {
-          var child = el.childNodes.item(i);
-          text += getText(child);
-        }
-
-        if (el.tagName == "P" || el.tagName == "BR" ||
-            el.tagName == "HR" || el.tagName == "DIV") {
-          text += "\n";
-        }
-      }
-
-      return text;
-    };
-
-    //sometimes the windows won't have this function
-    try {
-      var links = this.document.getElementsByTagName('a');
-    } catch (e) {
-      // ADD LOG LINE mresults.write('Error: '+ e, 'lightred');
-    }
-
-    for (var i = 0; i < links.length; i++) {
-      var el = links[i];
-      //if (getText(el).indexOf(this.linkName) != -1) {
-      if (el.innerHTML.indexOf(linkName) != -1) {
-        return el;
-      }
-    }
-
-    return null;
-  };
-
-  return nodeSearch(_document, this.getNodeForDocument, linkName);
-};
-
-/**
- * XPath()
- *
- * Finds an element by XPath
- */
-function XPath(_document, expr) {
-  if (expr == undefined) {
-    throw new Error('XPath constructor did not recieve enough arguments.');
-  }
-
-  this.getNodeForDocument = function (s) {
-    var aNode = this.document;
-    var aExpr = s;
-    var xpe = null;
-
-    if (this.document.defaultView == null) {
-      xpe = new getMethodInWindows('XPathEvaluator')();
-    } else {
-      xpe = new this.document.defaultView.XPathEvaluator();
-    }
-
-    var nsResolver = xpe.createNSResolver(aNode.ownerDocument == null ? aNode.documentElement
-                                                                      : aNode.ownerDocument.documentElement);
-    var result = xpe.evaluate(aExpr, aNode, nsResolver, 0, null);
-    var found = [];
-    var res;
-
-    while (res = result.iterateNext()) {
-      found.push(res);
-    }
-
-    return found[0];
-  };
-
-  return nodeSearch(_document, this.getNodeForDocument, expr);
-};
-
-/**
- * Name()
- *
- * Finds an element by Name
- */
-function Name(_document, nName) {
-  if (nName == undefined) {
-    throw new Error('Name constructor did not recieve enough arguments.');
-  }
-
-  this.getNodeForDocument = function (s) {
-    try{
-      var els = this.document.getElementsByName(s);
-      if (els.length > 0) {
-        return els[0];
-      }
-    } catch (e) {
-    }
-
-    return null;
-  };
-
-  return nodeSearch(_document, this.getNodeForDocument, nName);
-};
-
-
-var _returnResult = function (results) {
-  if (results.length == 0) {
-    return null
-  }
-  else if (results.length == 1) {
-    return results[0];
-  } else {
-    return results;
-  }
-}
-
-var _forChildren = function (element, name, value) {
-  var results = [];
-  var nodes = [e for each (e in element.childNodes) if (e)]
-
-  for (var i in nodes) {
-    var n = nodes[i];
-    if (n[name] == value) {
-      results.push(n);
-    }
-  }
-
-  return results;
-}
-
-var _forAnonChildren = function (_document, element, name, value) {
-  var results = [];
-  var nodes = [e for each (e in _document.getAnoymousNodes(element)) if (e)];
-
-  for (var i in nodes ) {
-    var n = nodes[i];
-    if (n[name] == value) {
-      results.push(n);
-    }
-  }
-
-  return results;
-}
-
-var _byID = function (_document, parent, value) {
-  return _returnResult(_forChildren(parent, 'id', value));
-}
-
-var _byName = function (_document, parent, value) {
-  return _returnResult(_forChildren(parent, 'tagName', value));
-}
-
-var _byAttrib = function (parent, attributes) {
-  var results = [];
-  var nodes = parent.childNodes;
-
-  for (var i in nodes) {
-    var n = nodes[i];
-    requirementPass = 0;
-    requirementLength = 0;
-
-    for (var a in attributes) {
-      requirementLength++;
-      try {
-        if (n.getAttribute(a) == attributes[a]) {
-          requirementPass++;
-        }
-      } catch (e) {
-        // Workaround any bugs in custom attribute crap in XUL elements
-      }
-    }
-
-    if (requirementPass == requirementLength) {
-      results.push(n);
-    }
-  }
-
-  return _returnResult(results)
-}
-
-var _byAnonAttrib = function (_document, parent, attributes) {
-  var results = [];
-
-  if (objects.getLength(attributes) == 1) {
-    for (var i in attributes) {
-      var k = i;
-      var v = attributes[i];
-    }
-
-    var result = _document.getAnonymousElementByAttribute(parent, k, v);
-    if (result) {
-      return result;
-    }
-  }
-
-  var nodes = [n for each (n in _document.getAnonymousNodes(parent)) if (n.getAttribute)];
-
-  function resultsForNodes (nodes) {
-    for (var i in nodes) {
-      var n = nodes[i];
-      requirementPass = 0;
-      requirementLength = 0;
-
-      for (var a in attributes) {
-        requirementLength++;
-        if (n.getAttribute(a) == attributes[a]) {
-          requirementPass++;
-        }
-      }
-
-      if (requirementPass == requirementLength) {
-        results.push(n);
-      }
-    }
-  }
-
-  resultsForNodes(nodes);
-  if (results.length == 0) {
-    resultsForNodes([n for each (n in parent.childNodes) if (n != undefined && n.getAttribute)])
-  }
-
-  return _returnResult(results)
-}
-
-var _byIndex = function (_document, parent, i) {
-  if (parent instanceof Array) {
-    return parent[i];
-  }
-
-  return parent.childNodes[i];
-}
-
-var _anonByName = function (_document, parent, value) {
-  return _returnResult(_forAnonChildren(_document, parent, 'tagName', value));
-}
-
-var _anonByAttrib = function (_document, parent, value) {
-  return _byAnonAttrib(_document, parent, value);
-}
-
-var _anonByIndex = function (_document, parent, i) {
-  return _document.getAnonymousNodes(parent)[i];
-}
-
-/**
- * Lookup()
- *
- * Finds an element by Lookup expression
- */
-function Lookup(_document, expression) {
-  if (expression == undefined) {
-    throw new Error('Lookup constructor did not recieve enough arguments.');
-  }
-
-  var expSplit = [e for each (e in smartSplit(expression) ) if (e != '')];
-  expSplit.unshift(_document);
-
-  var nCases = {'id':_byID, 'name':_byName, 'attrib':_byAttrib, 'index':_byIndex};
-  var aCases = {'name':_anonByName, 'attrib':_anonByAttrib, 'index':_anonByIndex};
-
-  var reduceLookup = function (parent, exp) {
-    // Handle case where only index is provided
-    var cases = nCases;
-
-    // Handle ending index before any of the expression gets mangled
-    if (withs.endsWith(exp, ']')) {
-      var expIndex = json2.JSON.parse(strings.vslice(exp, '[', ']'));
-    }
-
-    // Handle anon
-    if (withs.startsWith(exp, 'anon')) {
-      exp = strings.vslice(exp, '(', ')');
-      cases = aCases;
-    }
-
-    if (withs.startsWith(exp, '[')) {
-      try {
-        var obj = json2.JSON.parse(strings.vslice(exp, '[', ']'));
-      } catch (e) {
-        throw new Error(e + '. String to be parsed was || ' +
-                        strings.vslice(exp, '[', ']') + ' ||');
-      }
-
-      var r = cases['index'](_document, parent, obj);
-      if (r == null) {
-        throw new Error('Expression "' + exp +
-                        '" returned null. Anonymous == ' + (cases == aCases));
-      }
-
-      return r;
-    }
-
-    for (var c in cases) {
-      if (withs.startsWith(exp, c)) {
-        try {
-          var obj = json2.JSON.parse(strings.vslice(exp, '(', ')'))
-        } catch (e) {
-           throw new Error(e + '. String to be parsed was || ' +
-                           strings.vslice(exp, '(', ')') + '  ||');
-        }
-        var result = cases[c](_document, parent, obj);
-      }
-    }
-
-    if (!result) {
-      if ( withs.startsWith(exp, '{') ) {
-        try {
-          var obj = json2.JSON.parse(exp);
-        } catch (e) {
-          throw new Error(e + '. String to be parsed was || ' + exp + ' ||');
-        }
-
-        if (cases == aCases) {
-          var result = _anonByAttrib(_document, parent, obj);
-        } else {
-          var result = _byAttrib(parent, obj);
-        }
-      }
-
-      if (!result) {
-        throw new Error('Expression "' + exp +
-                        '" returned null. Anonymous == ' + (cases == aCases));
-      }
-    }
-
-    // Final return
-    if (expIndex) {
-      // TODO: Check length and raise error
-      return result[expIndex];
-    } else {
-      // TODO: Check length and raise error
-      return result;
-    }
-
-    // Maybe we should cause an exception here
-    return false;
-  };
-
-  return expSplit.reduce(reduceLookup);
-};

deleted file mode 100644
--- a/testing/peptest/peptest/extension/resource/mozmill/driver/mozelement.js
+++ /dev/null
@@ -1,718 +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 EXPORTED_SYMBOLS = ["Elem", "Selector", "ID", "Link", "XPath", "Name", "Lookup",
-                        "MozMillElement", "MozMillCheckBox", "MozMillRadio", "MozMillDropList",
-                        "MozMillTextBox", "subclasses",
-                       ];
-
-const NAMESPACE_XUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-var EventUtils = {};  Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
-
-var broker = {};      Cu.import('resource://mozmill/driver/msgbroker.js', broker);
-var elementslib = {}; Cu.import('resource://mozmill/driver/elementslib.js', elementslib);
-var utils = {};       Cu.import('resource://mozmill/stdlib/utils.js', utils);
-
-// A list of all the subclasses available.  Shared modules can push their own subclasses onto this list
-var subclasses = [MozMillCheckBox, MozMillRadio, MozMillDropList, MozMillTextBox];
-
-/**
- * createInstance()
- *
- * Returns an new instance of a MozMillElement
- * The type of the element is automatically determined
- */
-function createInstance(locatorType, locator, elem, document) {
-  if (elem) {
-    var args = { "element": elem,
-                 "document": document };
-    for (var i = 0; i < subclasses.length; ++i) {
-      if (subclasses[i].isType(elem)) {
-        return new subclasses[i](locatorType, locator, args);
-      }
-    }
-
-    if (MozMillElement.isType(elem)) {
-      return new MozMillElement(locatorType, locator, args);
-    }
-  }
-
-  throw new Error("could not find element " + locatorType + ": " + locator);
-};
-
-var Elem = function (node) {
-  return createInstance("Elem", node, node);
-};
-
-var Selector = function (document, selector, index) {
-  return createInstance("Selector", selector, elementslib.Selector(document, selector, index), document);
-};
-
-var ID = function (document, nodeID) {
-  return createInstance("ID", nodeID, elementslib.ID(document, nodeID), document);
-};
-
-var Link = function (document, linkName) {
-  return createInstance("Link", linkName, elementslib.Link(document, linkName), document);
-};
-
-var XPath = function (document, expr) {
-  return createInstance("XPath", expr, elementslib.XPath(document, expr), document);
-};
-
-var Name = function (document, nName) {
-  return createInstance("Name", nName, elementslib.Name(document, nName), document);
-};
-
-var Lookup = function (document, expression) {
-  return createInstance("Lookup", expression, elementslib.Lookup(document, expression), document);
-};
-
-/**
- * MozMillElement
- * The base class for all mozmill elements
- */
-function MozMillElement(locatorType, locator, args) {
-  args = args || {};
-  this._locatorType = locatorType;
-  this._locator = locator;
-  this._element = args["element"];
-  this._document = args["document"];
-  this._owner = args["owner"];
-  // Used to maintain backwards compatibility with controller.js
-  this.isElement = true;
-}
-
-// Static method that returns true if node is of this element type
-MozMillElement.isType = function (node) {
-  return true;
-};
-
-// This getter is the magic behind lazy loading (note distinction between _element and element)
-MozMillElement.prototype.__defineGetter__("element", function () {
-  if (this._element == undefined) {
-    if (elementslib[this._locatorType]) {
-      this._element = elementslib[this._locatorType](this._document, this._locator);
-    }
-    else if (this._locatorType == "Elem") {
-      this._element = this._locator;
-    } else {
-      throw new Error("Unknown locator type: " + this._locatorType);
-    }
-  }
-
-  return this._element;
-});
-
-// Returns the actual wrapped DOM node
-MozMillElement.prototype.getNode = function () {
-  return this.element;
-};
-
-MozMillElement.prototype.getInfo = function () {
-  return this._locatorType + ": " + this._locator;
-};
-
-/**
- * Sometimes an element which once existed will no longer exist in the DOM
- * This function re-searches for the element
- */
-MozMillElement.prototype.exists = function () {
-  this._element = undefined;
-  if (this.element) {
-    return true;
-  }
-
-  return false;
-};
-
-/**
- * Synthesize a keypress event on the given element
- *
- * @param {string} aKey
- *        Key to use for synthesizing the keypress event. It can be a simple
- *        character like "k" or a string like "VK_ESCAPE" for command keys
- * @param {object} aModifiers
- *        Information about the modifier keys to send
- *        Elements: accelKey   - Hold down the accelerator key (ctrl/meta)
- *                               [optional - default: false]
- *                  altKey     - Hold down the alt key
- *                              [optional - default: false]
- *                  ctrlKey    - Hold down the ctrl key
- *                               [optional - default: false]
- *                  metaKey    - Hold down the meta key (command key on Mac)
- *                               [optional - default: false]
- *                  shiftKey   - Hold down the shift key
- *                               [optional - default: false]
- * @param {object} aExpectedEvent
- *        Information about the expected event to occur
- *        Elements: target     - Element which should receive the event
- *                               [optional - default: current element]
- *                  type       - Type of the expected key event
- */
-MozMillElement.prototype.keypress = function (aKey, aModifiers, aExpectedEvent) {
-  if (!this.element) {
-    throw new Error("Could not find element " + this.getInfo());
-  }
-
-  var win = this.element.ownerDocument ? this.element.ownerDocument.defaultView
-                                       : this.element;
-  this.element.focus();
-
-  if (aExpectedEvent) {
-    var target = aExpectedEvent.target ? aExpectedEvent.target.getNode()
-                                       : this.element;
-    EventUtils.synthesizeKeyExpectEvent(aKey, aModifiers || {}, target, aExpectedEvent.type,
-                                        "MozMillElement.keypress()", win);
-  } else {
-    EventUtils.synthesizeKey(aKey, aModifiers || {}, win);
-  }
-
-  broker.pass({'function':'MozMillElement.keypress()'});
-
-  return true;
-};
-
-
-/**
- * Synthesize a general mouse event on the given element
- *
- * @param {ElemBase} aTarget
- *        Element which will receive the mouse event
- * @param {number} aOffsetX
- *        Relative x offset in the elements bounds to click on
- * @param {number} aOffsetY
- *        Relative y offset in the elements bounds to click on
- * @param {object} aEvent
- *        Information about the event to send
- *        Elements: accelKey   - Hold down the accelerator key (ctrl/meta)
- *                               [optional - default: false]
- *                  altKey     - Hold down the alt key
- *                               [optional - default: false]
- *                  button     - Mouse button to use
- *                               [optional - default: 0]
- *                  clickCount - Number of counts to click
- *                               [optional - default: 1]
- *                  ctrlKey    - Hold down the ctrl key
- *                               [optional - default: false]
- *                  metaKey    - Hold down the meta key (command key on Mac)
- *                               [optional - default: false]
- *                  shiftKey   - Hold down the shift key
- *                               [optional - default: false]
- *                  type       - Type of the mouse event ('click', 'mousedown',
- *                               'mouseup', 'mouseover', 'mouseout')
- *                               [optional - default: 'mousedown' + 'mouseup']
- * @param {object} aExpectedEvent
- *        Information about the expected event to occur
- *        Elements: target     - Element which should receive the event
- *                               [optional - default: current element]
- *                  type       - Type of the expected mouse event
- */
-MozMillElement.prototype.mouseEvent = function (aOffsetX, aOffsetY, aEvent, aExpectedEvent) {
-  if (!this.element) {
-    throw new Error(arguments.callee.name + ": could not find element " + this.getInfo());
-  }
-
-  // If no offset is given we will use the center of the element to click on.
-  var rect = this.element.getBoundingClientRect();
-  if (isNaN(aOffsetX)) {
-    aOffsetX = rect.width / 2;
-  }
-
-  if (isNaN(aOffsetY)) {
-    aOffsetY = rect.height / 2;
-  }
-
-  // Scroll element into view otherwise the click will fail
-  if (this.element.scrollIntoView) {
-    this.element.scrollIntoView();
-  }
-
-  if (aExpectedEvent) {
-    // The expected event type has to be set
-    if (!aExpectedEvent.type) {
-      throw new Error(arguments.callee.name + ": Expected event type not specified");
-    }
-
-    // If no target has been specified use the specified element
-    var target = aExpectedEvent.target ? aExpectedEvent.target.getNode()
-                                       : this.element;
-    if (!target) {
-      throw new Error(arguments.callee.name + ": could not find element " +
-                      aExpectedEvent.target.getInfo());
-    }
-
-    EventUtils.synthesizeMouseExpectEvent(this.element, aOffsetX, aOffsetY, aEvent,
-                                          target, aExpectedEvent.event,
-                                          "MozMillElement.mouseEvent()",
-                                          this.element.ownerDocument.defaultView);
-  } else {
-    EventUtils.synthesizeMouse(this.element, aOffsetX, aOffsetY, aEvent,
-                               this.element.ownerDocument.defaultView);
-  }
-
-  return true;
-};
-
-/**
- * Synthesize a mouse click event on the given element
- */
-MozMillElement.prototype.click = function (left, top, expectedEvent) {
-  // Handle menu items differently
-  if (this.element && this.element.tagName == "menuitem") {
-    this.element.click();
-  } else {
-    this.mouseEvent(left, top, {}, expectedEvent);
-  }
-
-  broker.pass({'function':'MozMillElement.click()'});
-
-  return true;
-};
-
-/**
- * Synthesize a double click on the given element
- */
-MozMillElement.prototype.doubleClick = function (left, top, expectedEvent) {
-  this.mouseEvent(left, top, {clickCount: 2}, expectedEvent);
-
-  broker.pass({'function':'MozMillElement.doubleClick()'});
-
-  return true;
-};
-
-/**
- * Synthesize a mouse down event on the given element
- */
-MozMillElement.prototype.mouseDown = function (button, left, top, expectedEvent) {
-  this.mouseEvent(left, top, {button: button, type: "mousedown"}, expectedEvent);
-
-  broker.pass({'function':'MozMillElement.mouseDown()'});
-
-  return true;
-};
-
-/**
- * Synthesize a mouse out event on the given element
- */
-MozMillElement.prototype.mouseOut = function (button, left, top, expectedEvent) {
-  this.mouseEvent(left, top, {button: button, type: "mouseout"}, expectedEvent);
-
-  broker.pass({'function':'MozMillElement.mouseOut()'});
-
-  return true;
-};
-
-/**
- * Synthesize a mouse over event on the given element
- */
-MozMillElement.prototype.mouseOver = function (button, left, top, expectedEvent) {
-  this.mouseEvent(left, top, {button: button, type: "mouseover"}, expectedEvent);
-
-  broker.pass({'function':'MozMillElement.mouseOver()'});
-
-  return true;
-};
-
-/**
- * Synthesize a mouse up event on the given element
- */
-MozMillElement.prototype.mouseUp = function (button, left, top, expectedEvent) {
-  this.mouseEvent(left, top, {button: button, type: "mouseup"}, expectedEvent);
-
-  broker.pass({'function':'MozMillElement.mouseUp()'});
-
-  return true;
-};
-
-/**
- * Synthesize a mouse middle click event on the given element
- */
-MozMillElement.prototype.middleClick = function (left, top, expectedEvent) {
-  this.mouseEvent(left, top, {button: 1}, expectedEvent);
-
-  broker.pass({'function':'MozMillElement.middleClick()'});
-
-  return true;
-};
-
-/**
- * Synthesize a mouse right click event on the given element
- */
-MozMillElement.prototype.rightClick = function (left, top, expectedEvent) {
-  this.mouseEvent(left, top, {type : "contextmenu", button: 2 }, expectedEvent);
-
-  broker.pass({'function':'MozMillElement.rightClick()'});
-
-  return true;
-};
-
-MozMillElement.prototype.waitForElement = function (timeout, interval) {
-  var elem = this;
-
-  utils.waitFor(function () {
-    return elem.exists();
-  }, "Timeout exceeded for waitForElement " + this.getInfo(), timeout, interval);
-
-  broker.pass({'function':'MozMillElement.waitForElement()'});
-};
-
-MozMillElement.prototype.waitForElementNotPresent = function (timeout, interval) {
-  var elem = this;
-
-  utils.waitFor(function () {
-    return !elem.exists();
-  }, "Timeout exceeded for waitForElementNotPresent " + this.getInfo(), timeout, interval);
-
-  broker.pass({'function':'MozMillElement.waitForElementNotPresent()'});
-};
-
-MozMillElement.prototype.waitThenClick = function (timeout, interval,
-                                                   left, top, expectedEvent) {
-  this.waitForElement(timeout, interval);
-  this.click(left, top, expectedEvent);
-};
-
-// Dispatches an HTMLEvent
-MozMillElement.prototype.dispatchEvent = function (eventType, canBubble, modifiers) {
-  canBubble = canBubble || true;
-  var evt = this.element.ownerDocument.createEvent('HTMLEvents');
-  evt.shiftKey = modifiers["shift"];
-  evt.metaKey = modifiers["meta"];
-  evt.altKey = modifiers["alt"];
-  evt.ctrlKey = modifiers["ctrl"];
-  evt.initEvent(eventType, canBubble, true);
-
-  this.element.dispatchEvent(evt);
-};
-
-
-//---------------------------------------------------------------------------------------------------------------------------------------
-
-
-/**
- * MozMillCheckBox
- * Checkbox element, inherits from MozMillElement
- */
-MozMillCheckBox.prototype = new MozMillElement();
-MozMillCheckBox.prototype.parent = MozMillElement.prototype;
-MozMillCheckBox.prototype.constructor = MozMillCheckBox;
-function MozMillCheckBox(locatorType, locator, args) {
-  this.parent.constructor.call(this, locatorType, locator, args);
-}
-
-// Static method returns true if node is this type of element
-MozMillCheckBox.isType = function (node) {
-  if ((node.localName.toLowerCase() == "input" && node.getAttribute("type") == "checkbox") ||
-      (node.localName.toLowerCase() == 'toolbarbutton' && node.getAttribute('type') == 'checkbox') ||
-      (node.localName.toLowerCase() == 'checkbox')) {
-    return true;
-  }
-
-  return false;
-};
-
-/**
- * Enable/Disable a checkbox depending on the target state
- */
-MozMillCheckBox.prototype.check = function (state) {
-  var result = false;
-
-  if (!this.element) {
-    throw new Error("could not find element " + this.getInfo());
-  }
-
-  // If we have a XUL element, unwrap its XPCNativeWrapper
-  if (this.element.namespaceURI == NAMESPACE_XUL) {
-    this.element = utils.unwrapNode(this.element);
-  }
-
-  state = (typeof(state) == "boolean") ? state : false;
-  if (state != this.element.checked) {
-    this.click();
-    var element = this.element;
-
-    utils.waitFor(function () {
-      return element.checked == state;
-    }, "Checkbox " + this.getInfo() + " could not be checked/unchecked", 500);
-
-    result = true;
-  }
-
-  broker.pass({'function':'MozMillCheckBox.check(' + this.getInfo() +
-               ', state: ' + state + ')'});
-  return result;
-};
-
-//----------------------------------------------------------------------------------------------------------------------------------------
-
-
-/**
- * MozMillRadio
- * Radio button inherits from MozMillElement
- */
-MozMillRadio.prototype = new MozMillElement();
-MozMillRadio.prototype.parent = MozMillElement.prototype;
-MozMillRadio.prototype.constructor = MozMillRadio;
-function MozMillRadio(locatorType, locator, args) {
-  this.parent.constructor.call(this, locatorType, locator, args);
-}
-
-// Static method returns true if node is this type of element
-MozMillRadio.isType = function (node) {
-  if ((node.localName.toLowerCase() == 'input' && node.getAttribute('type') == 'radio') ||
-      (node.localName.toLowerCase() == 'toolbarbutton' && node.getAttribute('type') == 'radio') ||
-      (node.localName.toLowerCase() == 'radio') ||
-      (node.localName.toLowerCase() == 'radiogroup')) {
-    return true;
-  }
-
-  return false;
-};
-
-/**
- * Select the given radio button
- *
- * index - Specifies which radio button in the group to select (only applicable to radiogroup elements)
- *         Defaults to the first radio button in the group
- */
-MozMillRadio.prototype.select = function (index) {
-  if (!this.element) {
-    throw new Error("could not find element " + this.getInfo());
-  }
-
-  if (this.element.localName.toLowerCase() == "radiogroup") {
-    var element = this.element.getElementsByTagName("radio")[index || 0];
-    new MozMillRadio("Elem", element).click();
-  } else {
-    var element = this.element;
-    this.click();
-  }
-
-  utils.waitFor(function () {
-    // If we have a XUL element, unwrap its XPCNativeWrapper
-    if (element.namespaceURI == NAMESPACE_XUL) {
-      element = utils.unwrapNode(element);
-      return element.selected == true;
-    }
-
-    return element.checked == true;
-  }, "Radio button " + this.getInfo() + " could not be selected", 500);
-
-  broker.pass({'function':'MozMillRadio.select(' + this.getInfo() + ')'});
-
-  return true;
-};
-
-//----------------------------------------------------------------------------------------------------------------------------------------
-
-
-/**
- * MozMillDropList
- * DropList inherits from MozMillElement
- */
-MozMillDropList.prototype = new MozMillElement();
-MozMillDropList.prototype.parent = MozMillElement.prototype;
-MozMillDropList.prototype.constructor = MozMillDropList;
-function MozMillDropList(locatorType, locator, args) {
-  this.parent.constructor.call(this, locatorType, locator, args);
-};
-
-// Static method returns true if node is this type of element
-MozMillDropList.isType = function (node) {
-  if ((node.localName.toLowerCase() == 'toolbarbutton' && (node.getAttribute('type') == 'menu' || node.getAttribute('type') == 'menu-button')) ||
-      (node.localName.toLowerCase() == 'menu') ||
-      (node.localName.toLowerCase() == 'menulist') ||
-      (node.localName.toLowerCase() == 'select' )) {
-    return true;
-  }
-
-  return false;
-};
-
-/* Select the specified option and trigger the relevant events of the element */
-MozMillDropList.prototype.select = function (indx, option, value) {
-  if (!this.element){
-    throw new Error("Could not find element " + this.getInfo());
-  }
-
-  //if we have a select drop down
-  if (this.element.localName.toLowerCase() == "select"){
-    var item = null;
-
-    // The selected item should be set via its index
-    if (indx != undefined) {
-      // Resetting a menulist has to be handled separately
-      if (indx == -1) {
-        this.dispatchEvent('focus', false);
-        this.element.selectedIndex = indx;
-        this.dispatchEvent('change', true);
-
-        broker.pass({'function':'MozMillDropList.select()'});
-
-        return true;
-      } else {
-        item = this.element.options.item(indx);
-      }
-    } else {
-      for (var i = 0; i < this.element.options.length; i++) {
-        var entry = this.element.options.item(i);
-        if (option != undefined && entry.innerHTML == option ||
-            value != undefined && entry.value == value) {
-          item = entry;
-          break;
-        }
-      }
-    }
-
-    // Click the item
-    try {
-      // EventUtils.synthesizeMouse doesn't work.
-      this.dispatchEvent('focus', false);
-      item.selected = true;
-      this.dispatchEvent('change', true);
-
-      broker.pass({'function':'MozMillDropList.select()'});
-
-      return true;
-    } catch (e) {
-      throw new Error("No item selected for element " + this.getInfo());
-    }
-  }
-  //if we have a xul menupopup select accordingly
-  else if (this.element.namespaceURI.toLowerCase() == NAMESPACE_XUL) {
-    var ownerDoc = this.element.ownerDocument;
-    // Unwrap the XUL element's XPCNativeWrapper
-    this.element = utils.unwrapNode(this.element);
-    // Get the list of menuitems
-    menuitems = this.element.getElementsByTagName("menupopup")[0].getElementsByTagName("menuitem");
-
-    var item = null;
-
-    if (indx != undefined) {
-      if (indx == -1) {
-        this.dispatchEvent('focus', false);
-        this.element.boxObject.QueryInterface(Ci.nsIMenuBoxObject).activeChild = null;
-        this.dispatchEvent('change', true);
-
-        broker.pass({'function':'MozMillDropList.select()'});
-
-        return true;
-      } else {
-        item = menuitems[indx];
-      }
-    } else {
-      for (var i = 0; i < menuitems.length; i++) {
-        var entry = menuitems[i];
-        if (option != undefined && entry.label == option ||
-            value != undefined && entry.value == value) {
-          item = entry;
-          break;
-        }
-      }
-    }
-
-    // Click the item
-    try {
-      EventUtils.synthesizeMouse(this.element, 1, 1, {}, ownerDoc.defaultView);
-
-      // Scroll down until item is visible
-      for (var i = 0; i <= menuitems.length; ++i) {
-        var selected = this.element.boxObject.QueryInterface(Ci.nsIMenuBoxObject).activeChild;
-        if (item == selected) {
-          break;
-        }
-        EventUtils.synthesizeKey("VK_DOWN", {}, ownerDoc.defaultView);
-      }
-
-      EventUtils.synthesizeMouse(item, 1, 1, {}, ownerDoc.defaultView);
-
-      broker.pass({'function':'MozMillDropList.select()'});
-
-      return true;
-    } catch (e) {
-      throw new Error('No item selected for element ' + this.getInfo());
-    }
-  }
-};
-
-
-//----------------------------------------------------------------------------------------------------------------------------------------
-
-
-/**
- * MozMillTextBox
- * TextBox inherits from MozMillElement
- */
-MozMillTextBox.prototype = new MozMillElement();
-MozMillTextBox.prototype.parent = MozMillElement.prototype;
-MozMillTextBox.prototype.constructor = MozMillTextBox;
-function MozMillTextBox(locatorType, locator, args) {
-  this.parent.constructor.call(this, locatorType, locator, args);
-};
-
-// Static method returns true if node is this type of element
-MozMillTextBox.isType = function (node) {
-  if ((node.localName.toLowerCase() == 'input' && (node.getAttribute('type') == 'text' || node.getAttribute('type') == 'search')) ||
-      (node.localName.toLowerCase() == 'textarea') ||
-      (node.localName.toLowerCase() == 'textbox')) {
-    return true;
-  }
-
-  return false;
-};
-
-/**
- * Synthesize keypress events for each character on the given element
- *
- * @param {string} aText
- *        The text to send as single keypress events
- * @param {object} aModifiers
- *        Information about the modifier keys to send
- *        Elements: accelKey   - Hold down the accelerator key (ctrl/meta)
- *                               [optional - default: false]
- *                  altKey     - Hold down the alt key
- *                              [optional - default: false]
- *                  ctrlKey    - Hold down the ctrl key
- *                               [optional - default: false]
- *                  metaKey    - Hold down the meta key (command key on Mac)
- *                               [optional - default: false]
- *                  shiftKey   - Hold down the shift key
- *                               [optional - default: false]
- * @param {object} aExpectedEvent
- *        Information about the expected event to occur
- *        Elements: target     - Element which should receive the event
- *                               [optional - default: current element]
- *                  type       - Type of the expected key event
- */
-MozMillTextBox.prototype.sendKeys = function (aText, aModifiers, aExpectedEvent) {
-  if (!this.element) {
-    throw new Error("could not find element " + this.getInfo());
-  }
-
-  var element = this.element;
-  Array.forEach(aText, function (letter) {
-    var win = element.ownerDocument ? element.ownerDocument.defaultView
-                                    : element;
-    element.focus();
-
-    if (aExpectedEvent) {
-      var target = aExpectedEvent.target ? aExpectedEvent.target.getNode()
-                                         : element;
-      EventUtils.synthesizeKeyExpectEvent(letter, aModifiers || {}, target,
-                                          aExpectedEvent.type,
-                                          "MozMillTextBox.sendKeys()", win);
-    } else {
-      EventUtils.synthesizeKey(letter, aModifiers || {}, win);
-    }
-  });
-
-  broker.pass({'function':'MozMillTextBox.type()'});
-
-  return true;
-};

deleted file mode 100644
--- a/testing/peptest/peptest/extension/resource/mozmill/driver/mozmill.js
+++ /dev/null
@@ -1,434 +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 EXPORTED_SYMBOLS = ["controller", "utils", "elementslib", "os",
-                        "getBrowserController", "newBrowserController", 
-                        "getAddonsController", "getPreferencesController", 
-                        "newMail3PaneController", "getMail3PaneController", 
-                        "wm", "platform", "getAddrbkController", 
-                        "getMsgComposeController", "getDownloadsController",
-                        "Application", "cleanQuit", "findElement",
-                        "getPlacesController", 'isMac', 'isLinux', 'isWindows',
-                        "firePythonCallback"
-                       ];
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-// imports
-var controller = {};  Cu.import('resource://mozmill/driver/controller.js', controller);
-var elementslib = {}; Cu.import('resource://mozmill/driver/elementslib.js', elementslib);
-var broker = {};      Cu.import('resource://mozmill/driver/msgbroker.js', broker);
-var findElement = {}; Cu.import('resource://mozmill/driver/mozelement.js', findElement);
-var utils = {};       Cu.import('resource://mozmill/stdlib/utils.js', utils);
-var os = {}; Cu.import('resource://mozmill/stdlib/os.js', os);
-
-try {
-  Cu.import("resource://gre/modules/AddonManager.jsm");
-} catch (e) {
-  /* Firefox 4 only */
-}
-
-// platform information
-var platform = os.getPlatform();
-var isMac = false;
-var isWindows = false;
-var isLinux = false;
-
-if (platform == "darwin"){
-  isMac = true;
-}
-
-if (platform == "winnt"){
-  isWindows = true;
-}
-
-if (platform == "linux"){
-  isLinux = true;
-}
-
-var aConsoleService = Cc["@mozilla.org/consoleservice;1"]
-                      .getService(Ci.nsIConsoleService);
-var appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo);
-var locale = Cc["@mozilla.org/chrome/chrome-registry;1"]
-             .getService(Ci.nsIXULChromeRegistry)
-             .getSelectedLocale("global");
-var wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);
-
-const applicationDictionary = {
-  "{718e30fb-e89b-41dd-9da7-e25a45638b28}": "Sunbird",
-  "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}": "SeaMonkey",
-  "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}": "Firefox",
-  "{3550f703-e582-4d05-9a08-453d09bdfdc6}": 'Thunderbird'
-};
-
-var Application = applicationDictionary[appInfo.ID];
-
-if (Application == undefined) {
-  // Default to Firefox
-  var Application = 'Firefox';
-}
-
-// get startup time if available
-// see http://blog.mozilla.com/tglek/2011/04/26/measuring-startup-speed-correctly/
-var startupInfo = {};
-try {
-  var _startupInfo = Cc["@mozilla.org/toolkit/app-startup;1"]
-                     .getService(Ci.nsIAppStartup).getStartupInfo();
-  for (var i in _startupInfo) {
-    // convert from Date object to ms since epoch
-    startupInfo[i] = _startupInfo[i].getTime();
-  }
-} catch (e) {
-  startupInfo = null;
-}
-
-
-// keep list of installed addons to send to jsbridge for test run report
-var addons = "null"; // this will be JSON parsed
-if (typeof AddonManager != "undefined") {
-  AddonManager.getAllAddons(function (addonList) {
-      var converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-                      .createInstance(Ci.nsIScriptableUnicodeConverter);
-      converter.charset = 'utf-8';
-
-      function replacer(key, value) {
-        if (typeof(value) == "string") {
-          try {
-            return converter.ConvertToUnicode(value);
-          } catch (e) {
-            var newstring = '';
-            for (var i=0; i < value.length; i++) {
-              replacement = '';
-              if ((32 <= value.charCodeAt(i)) && (value.charCodeAt(i) < 127)) {
-                // eliminate non-convertable characters;
-                newstring += value.charAt(i);
-              } else {
-                newstring += replacement;
-              }
-            }
-            return newstring;
-          }
-        }
-        return value;
-      }
-
-      addons = converter.ConvertToUnicode(JSON.stringify(addonList, replacer))
-  });
-}
-
-function cleanQuit () {
-  utils.getMethodInWindows('goQuitApplication')();
-}
-
-function addHttpResource (directory, namespace) {
-  return 'http://localhost:4545/'+namespace;
-}
-
-function newBrowserController () {
-  return new controller.MozMillController(utils.getMethodInWindows('OpenBrowserWindow')());
-}
-
-function getBrowserController () {
-  var browserWindow = wm.getMostRecentWindow("navigator:browser");
-
-  if (browserWindow == null) {
-    return newBrowserController();
-  } else {
-    return new controller.MozMillController(browserWindow);
-  }
-}
-
-function getPlacesController () {
-  utils.getMethodInWindows('PlacesCommandHook').showPlacesOrganizer('AllBookmarks');
-
-  return new controller.MozMillController(wm.getMostRecentWindow(''));
-}
-
-function getAddonsController () {
-  if (Application == 'SeaMonkey') {
-    utils.getMethodInWindows('toEM')();
-  }
-  else if (Application == 'Thunderbird') {
-    utils.getMethodInWindows('openAddonsMgr')();
-  }
-  else if (Application == 'Sunbird') {
-    utils.getMethodInWindows('goOpenAddons')();
-  } else {
-    utils.getMethodInWindows('BrowserOpenAddonsMgr')();
-  }
-
-  return new controller.MozMillController(wm.getMostRecentWindow(''));
-}
-
-function getDownloadsController() {
-  utils.getMethodInWindows('BrowserDownloadsUI')();
-
-  return new controller.MozMillController(wm.getMostRecentWindow(''));
-}
-
-function getPreferencesController() {
-  if (Application == 'Thunderbird') {
-    utils.getMethodInWindows('openOptionsDialog')();
-  } else {
-    utils.getMethodInWindows('openPreferences')();
-  }
-
-  return new controller.MozMillController(wm.getMostRecentWindow(''));
-}
-
-// Thunderbird functions
-function newMail3PaneController () {
-  return new controller.MozMillController(utils.getMethodInWindows('toMessengerWindow')());
-}
- 
-function getMail3PaneController () {
-  var mail3PaneWindow = wm.getMostRecentWindow("mail:3pane");
-
-  if (mail3PaneWindow == null) {
-    return newMail3PaneController();
-  } else {
-    return new controller.MozMillController(mail3PaneWindow);
-  }
-}
-
-// Thunderbird - Address book window
-function newAddrbkController () {
-  utils.getMethodInWindows("toAddressBook")();
-  utils.sleep(2000);
-  var addyWin = wm.getMostRecentWindow("mail:addressbook");
-
-  return new controller.MozMillController(addyWin);
-}
-
-function getAddrbkController () {
-  var addrbkWindow = wm.getMostRecentWindow("mail:addressbook");
-  if (addrbkWindow == null) {
-    return newAddrbkController();
-  } else {
-    return new controller.MozMillController(addrbkWindow);
-  }
-}
-
-function firePythonCallback (filename, method, args, kwargs) {
-  obj = {'filename': filename, 'method': method};
-  obj['args'] = args || [];
-  obj['kwargs'] = kwargs || {};
-
-  broker.sendMessage("firePythonCallback", obj);
-}
-
-function timer (name) {
-  this.name = name;
-  this.timers = {};
-  this.actions = [];
-
-  frame.timers.push(this);
-}
-
-timer.prototype.start = function (name) {
-  this.timers[name].startTime = (new Date).getTime();
-}
-
-timer.prototype.stop = function (name) {
-  var t = this.timers[name];
-
-  t.endTime = (new Date).getTime();
-  t.totalTime = (t.endTime - t.startTime);
-}
-
-timer.prototype.end = function () {
-  frame.events.fireEvent("timer", this);
-  frame.timers.remove(this);
-}
-
-// Initialization
-
-/**
- * Console listener which listens for error messages in the console and forwards
- * them to the Mozmill reporting system for output.
- */
-function ConsoleListener() {
- this.register();
-}
-
-ConsoleListener.prototype = {
-  observe: function (aMessage) {
-    var msg = aMessage.message;
-    var re = /^\[.*Error:.*(chrome|resource):\/\/.*/i;
-    if (msg.match(re)) {
-      broker.fail(aMessage);
-    }
-  },
-
-  QueryInterface: function (iid) {
-    if (!iid.equals(Ci.nsIConsoleListener) && !iid.equals(Ci.nsISupports)) {
-      throw Components.results.NS_ERROR_NO_INTERFACE;
-    }
-
-    return this;
-  },
-
-  register: function () {
-    var aConsoleService = Cc["@mozilla.org/consoleservice;1"]
-                          .getService(Ci.nsIConsoleService);
-    aConsoleService.registerListener(this);
-  },
-
-  unregister: function () {
-    var aConsoleService = Cc["@mozilla.org/consoleservice;1"]
-                          .getService(Ci.nsIConsoleService);
-    aConsoleService.unregisterListener(this);
- }
-}
-
-// start listening
-var consoleListener = new ConsoleListener();
-
-
-// Observer when a new top-level window is ready
-var windowReadyObserver = {
-  observe: function (aSubject, aTopic, aData) {
-    attachEventListeners(aSubject);
-  }
-};
-
-
-// Observer when a top-level window is closed
-var windowCloseObserver = {
-  observe: function (aSubject, aTopic, aData) {
-    controller.windowMap.remove(utils.getWindowId(aSubject));
-  }
-};
-
-
-/**
- * Attach event listeners
- *
- * @param {ChromeWindow} aWindow
- *        Window to attach listeners on.
- */
-function attachEventListeners(aWindow) {
-  // These are the event handlers
-  var pageShowHandler = function (aEvent) {
-    var doc = aEvent.originalTarget;
-
-    // Only update the flag if we have a document as target
-    // see https://bugzilla.mozilla.org/show_bug.cgi?id=690829
-    if ("defaultView" in doc) {
-      var id = utils.getWindowId(doc.defaultView);
-      controller.windowMap.update(id, "loaded", true);
-      //dump("*** pageshow event: " + id + ", " + doc.location + ", baseURI=" + doc.baseURI + "\n");
-    }
-
-    // We need to add/remove the unload/pagehide event listeners to preserve caching.
-    aWindow.getBrowser().addEventListener("beforeunload", beforeUnloadHandler, true);
-    aWindow.getBrowser().addEventListener("pagehide", pageHideHandler, true);
-  };
-
-  var DOMContentLoadedHandler = function (aEvent) {
-    var doc = aEvent.originalTarget;
-
-    var errorRegex = /about:.+(error)|(blocked)\?/;
-    if (errorRegex.exec(doc.baseURI)) {
-      // Wait about 1s to be sure the DOM is ready
-      utils.sleep(1000);
-
-      // Only update the flag if we have a document as target
-      if ("defaultView" in doc) {
-        var id = utils.getWindowId(doc.defaultView);
-        controller.windowMap.update(id, "loaded", true);
-        //dump("*** DOMContentLoaded event: " + id + ", " + doc.location + ", baseURI=" + doc.baseURI + "\n");
-      }
-
-      // We need to add/remove the unload event listener to preserve caching.
-      aWindow.getBrowser().addEventListener("beforeunload", beforeUnloadHandler, true);
-    }
-  };
-
-  // beforeunload is still needed because pagehide doesn't fire before the page is unloaded.
-  // still use pagehide for cases when beforeunload doesn't get fired
-  var beforeUnloadHandler = function (aEvent) {
-    var doc = aEvent.originalTarget;
-
-    // Only update the flag if we have a document as target
-    if ("defaultView" in doc) {
-      var id = utils.getWindowId(doc.defaultView);
-      controller.windowMap.update(id, "loaded", false);
-      //dump("*** beforeunload event: " + id + ", " + doc.location + ", baseURI=" + doc.baseURI + "\n");
-    }
-
-    aWindow.getBrowser().removeEventListener("beforeunload", beforeUnloadHandler, true);
-  };
-
-  var pageHideHandler = function (aEvent) {
-    // If event.persisted is false, the beforeUnloadHandler should fire
-    // and there is no need for this event handler.
-    if (aEvent.persisted) {
-      var doc = aEvent.originalTarget;
-
-      // Only update the flag if we have a document as target
-      if ("defaultView" in doc) {
-        var id = utils.getWindowId(doc.defaultView);
-        controller.windowMap.update(id, "loaded", false);
-        //dump("*** pagehide event: " + id + ", " + doc.location + ", baseURI=" + doc.baseURI + "\n");
-      }
-
-      aWindow.getBrowser().removeEventListener("beforeunload", beforeUnloadHandler, true);
-    }
-  };
-
-  var onWindowLoaded = function (aEvent) {
-    controller.windowMap.update(utils.getWindowId(aWindow), "loaded", true);
-
-    let browser = aWindow.getBrowser();
-    if (browser) {
-      // Page is ready
-      browser.addEventListener("pageshow", pageShowHandler, true);
-
-      // Note: Error pages will never fire a "pageshow" event. For those we
-      // have to wait for the "DOMContentLoaded" event. That's the final state.
-      // Error pages will always have a baseURI starting with
-      // "about:" followed by "error" or "blocked".
-      browser.addEventListener("DOMContentLoaded", DOMContentLoadedHandler, true);
-
-      // Leave page (use caching)
-      browser.addEventListener("pagehide", pageHideHandler, true);
-    }
-  }
-
-  // Add the event handlers to the tabbedbrowser once its window has loaded
-  if (aWindow.content) {
-    onWindowLoaded();
-  } else {
-    aWindow.addEventListener("load", onWindowLoaded, false);
-  }
-}
-
-/**
- * Initialize Mozmill
- */
-function initialize() {
-  // Activate observer for new top level windows
-  var observerService = Cc["@mozilla.org/observer-service;1"].
-                        getService(Ci.nsIObserverService);
-  observerService.addObserver(windowReadyObserver, "toplevel-window-ready", false);
-  observerService.addObserver(windowCloseObserver, "outer-window-destroyed", false);
-
-  // Attach event listeners to all open windows
-  var enumerator = Cc["@mozilla.org/appshell/window-mediator;1"].
-                   getService(Ci.nsIWindowMediator).getEnumerator("");
-  while (enumerator.hasMoreElements()) {
-    var win = enumerator.getNext();
-    attachEventListeners(win);
-
-    // For windows or dialogs already open we have to explicitly set the property
-    // otherwise windows which load really quick on startup never gets the
-    // property set and we fail to create the controller
-    controller.windowMap.update(utils.getWindowId(win), "loaded", true);
-  }
-}
-
-initialize();

deleted file mode 100644
--- a/testing/peptest/peptest/extension/resource/mozmill/driver/msgbroker.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 EXPORTED_SYMBOLS = ['addListener', 'addObject',
-                        'removeListener',
-                        'sendMessage', 'log', 'pass', 'fail'];
-
-var listeners = {};
-
-// add a listener for a specific message type
-function addListener(msgType, listener) {
-  if (listeners[msgType] === undefined) {
-    listeners[msgType] = [];
-  }
-
-  listeners[msgType].push(listener);
-}
-
-// add each method in an object as a message listener
-function addObject(object) {
-  for (var msgType in object) {
-    addListener(msgType, object[msgType]);
-  }
-}
-
-// remove a listener for all message types
-function removeListener(listener) {
-  for (var msgType in listeners) {
-    for (let i = 0; i < listeners.length; ++i) {
-      if (listeners[msgType][i] == listener) {
-        listeners[msgType].splice(i, 1); // remove listener from array
-      }
-    }
-  }
-}
-
-function sendMessage(msgType, obj) {
-  if (listeners[msgType] === undefined) {
-    return;
-  }
-
-  for (let i = 0; i < listeners[msgType].length; ++i) {
-    listeners[msgType][i](obj);
-  }
-}
-
-function log(obj) {
-  sendMessage('log', obj);
-}
-
-function pass(obj) {
-  sendMessage('pass', obj);
-}
-
-function fail(obj) {
-  sendMessage('fail', obj);
-}

deleted file mode 100644
--- a/testing/peptest/peptest/extension/resource/mozmill/stdlib/EventUtils.js
+++ /dev/null
@@ -1,833 +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/. */
-
-// Export all available functions for Mozmill
-var EXPORTED_SYMBOLS = ["sendMouseEvent", "sendChar", "sendString", "sendKey",
-                        "synthesizeMouse", "synthesizeMouseScroll", "synthesizeKey",
-                        "synthesizeMouseExpectEvent", "synthesizeKeyExpectEvent",
-                        "synthesizeDragStart", "synthesizeDrop", "synthesizeText",
-                        "disableNonTestMouseEvents", "synthesizeComposition",
-                        "synthesizeQuerySelectedText", "synthesizeQueryTextContent",
-                        "synthesizeQueryCaretRect", "synthesizeQueryTextRect",
-                        "synthesizeQueryEditorRect", "synthesizeCharAtPoint",
-                        "synthesizeSelectionSet"];
-
-/**
- * Get the array with available key events
- */
-function getKeyEvent(aWindow) {
-  var win = aWindow.wrappedJSObject ? aWindow.wrappedJSObject : aWindow;
-  return win.KeyEvent;
-}
-
-/**
- * EventUtils provides some utility methods for creating and sending DOM events.
- * Current methods:
- *  sendMouseEvent
- *  sendChar
- *  sendString
- *  sendKey
- */
-
-/**
- * Send a mouse event to the node aTarget (aTarget can be an id, or an
- * actual node) . The "event" passed in to aEvent is just a JavaScript
- * object with the properties set that the real mouse event object should
- * have. This includes the type of the mouse event.
- * E.g. to send an click event to the node with id 'node' you might do this:
- *
- * sendMouseEvent({type:'click'}, 'node');
- */
-function sendMouseEvent(aEvent, aTarget, aWindow) {
-  if (['click', 'mousedown', 'mouseup', 'mouseover', 'mouseout'].indexOf(aEvent.type) == -1) {
-    throw new Error("sendMouseEvent doesn't know about event type '" + aEvent.type + "'");
-  }
-
-  if (!aWindow) {
-    aWindow = window;
-  }
-
-  if (!(aTarget instanceof Element)) {
-    aTarget = aWindow.document.getElementById(aTarget);
-  }
-
-  var event = aWindow.document.createEvent('MouseEvent');
-
-  var typeArg          = aEvent.type;
-  var canBubbleArg     = true;
-  var cancelableArg    = true;
-  var viewArg          = aWindow;
-  var detailArg        = aEvent.detail        || (aEvent.type == 'click'     ||
-                                                  aEvent.type == 'mousedown' ||
-                                                  aEvent.type == 'mouseup' ? 1 : 0);
-  var screenXArg       = aEvent.screenX       || 0;
-  var screenYArg       = aEvent.screenY       || 0;
-  var clientXArg       = aEvent.clientX       || 0;
-  var clientYArg       = aEvent.clientY       || 0;
-  var ctrlKeyArg       = aEvent.ctrlKey       || false;
-  var altKeyArg        = aEvent.altKey        || false;
-  var shiftKeyArg      = aEvent.shiftKey      || false;
-  var metaKeyArg       = aEvent.metaKey       || false;
-  var buttonArg        = aEvent.button        || 0;
-  var relatedTargetArg = aEvent.relatedTarget || null;
-
-  event.initMouseEvent(typeArg, canBubbleArg, cancelableArg, viewArg, detailArg,
-                       screenXArg, screenYArg, clientXArg, clientYArg,
-                       ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg,
-                       buttonArg, relatedTargetArg);
-
-  aTarget.dispatchEvent(event);
-}
-
-/**
- * Send the char aChar to the node with id aTarget.  If aTarget is not
- * provided, use "target".  This method handles casing of chars (sends the
- * right charcode, and sends a shift key for uppercase chars).  No other
- * modifiers are handled at this point.
- *
- * For now this method only works for English letters (lower and upper case)
- * and the digits 0-9.
- *
- * Returns true if the keypress event was accepted (no calls to preventDefault
- * or anything like that), false otherwise.
- */
-function sendChar(aChar, aTarget) {
-  // DOM event charcodes match ASCII (JS charcodes) for a-zA-Z0-9.
-  var hasShift = (aChar == aChar.toUpperCase());
-  var charCode = aChar.charCodeAt(0);
-  var keyCode = charCode;
-  if (!hasShift) {
-    // For lowercase letters, the keyCode is actually 32 less than the charCode
-    keyCode -= 0x20;
-  }
-
-  return __doEventDispatch(aTarget, charCode, keyCode, hasShift);
-}
-
-/**
- * Send the string aStr to the node with id aTarget.  If aTarget is not
- * provided, use "target".
- *
- * For now this method only works for English letters (lower and upper case)
- * and the digits 0-9.
- */
-function sendString(aStr, aTarget) {
-  for (var i = 0; i < aStr.length; ++i) {
-    sendChar(aStr.charAt(i), aTarget);
-  }
-}
-
-/**
- * Send the non-character key aKey to the node with id aTarget. If aTarget is
- * not provided, use "target".
- * The name of the key should be the part that comes after "DOM_VK_" in the
- *   KeyEvent constant name for this key.
- * No modifiers are handled at this point.
- *
- * Returns true if the keypress event was accepted (no calls to preventDefault
- * or anything like that), false otherwise.
- */
-function sendKey(aKey, aTarget, aWindow) {
-  if (!aWindow)
-    aWindow = window;
-
-  var keyName = "DOM_VK_" + aKey.toUpperCase();
-
-  if (!getKeyEvent(aWindow)[keyName]) {
-    throw "Unknown key: " + keyName;
-  }
-
-  return __doEventDispatch(aTarget, 0, getKeyEvent(aWindow)[keyName], false);
-}
-
-/**
- * Actually perform event dispatch given a charCode, keyCode, and boolean for
- * whether "shift" was pressed.  Send the event to the node with id aTarget.  If
- * aTarget is not provided, use "target".
- *
- * Returns true if the keypress event was accepted (no calls to preventDefault
- * or anything like that), false otherwise.
- */
-function __doEventDispatch(aTarget, aCharCode, aKeyCode, aHasShift) {
-  if (aTarget === undefined) {
-    aTarget = "target";
-  }
-
-  var event = document.createEvent("KeyEvents");
-  event.initKeyEvent("keydown", true, true, document.defaultView,
-                     false, false, aHasShift, false,
-                     aKeyCode, 0);
-  var accepted = $(aTarget).dispatchEvent(event);
-
-  // Preventing the default keydown action also prevents the default
-  // keypress action.
-  event = document.createEvent("KeyEvents");
-  if (aCharCode) {
-    event.initKeyEvent("keypress", true, true, document.defaultView,
-                       false, false, aHasShift, false,
-                       0, aCharCode);
-  } else {
-    event.initKeyEvent("keypress", true, true, document.defaultView,
-                       false, false, aHasShift, false,
-                       aKeyCode, 0);
-  }
-  if (!accepted) {
-    event.preventDefault();
-  }
-  accepted = $(aTarget).dispatchEvent(event);
-
-  // Always send keyup
-  var event = document.createEvent("KeyEvents");
-  event.initKeyEvent("keyup", true, true, document.defaultView,
-                     false, false, aHasShift, false,
-                     aKeyCode, 0);
-  $(aTarget).dispatchEvent(event);
-  return accepted;
-}
-
-/**
- * Parse the key modifier flags from aEvent. Used to share code between
- * synthesizeMouse and synthesizeKey.
- */
-function _parseModifiers(aEvent)
-{
-  var hwindow = Components.classes["@mozilla.org/appshell/appShellService;1"]
-                          .getService(Components.interfaces.nsIAppShellService)
-                          .hiddenDOMWindow;
-
-  const masks = Components.interfaces.nsIDOMNSEvent;
-  var mval = 0;
-  if (aEvent.shiftKey)
-    mval |= masks.SHIFT_MASK;
-  if (aEvent.ctrlKey)
-    mval |= masks.CONTROL_MASK;
-  if (aEvent.altKey)
-    mval |= masks.ALT_MASK;
-  if (aEvent.metaKey)
-    mval |= masks.META_MASK;
-  if (aEvent.accelKey)
-    mval |= (hwindow.navigator.platform.indexOf("Mac") >= 0) ? masks.META_MASK :
-                                                               masks.CONTROL_MASK;
-
-  return mval;
-}
-
-/**
- * Synthesize a mouse event on a target. The actual client point is determined
- * by taking the aTarget's client box and offseting it by aOffsetX and
- * aOffsetY. This allows mouse clicks to be simulated by calling this method.
- *
- * aEvent is an object which may contain the properties:
- *   shiftKey, ctrlKey, altKey, metaKey, accessKey, clickCount, button, type
- *
- * If the type is specified, an mouse event of that type is fired. Otherwise,
- * a mousedown followed by a mouse up is performed.
- *
- * aWindow is optional, and defaults to the current window object.
- */
-function synthesizeMouse(aTarget, aOffsetX, aOffsetY, aEvent, aWindow)
-{
-  if (!aWindow)
-    aWindow = window;
-
-  var utils = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                      getInterface(Components.interfaces.nsIDOMWindowUtils);
-  if (utils) {
-    var button = aEvent.button || 0;
-    var clickCount = aEvent.clickCount || 1;
-    var modifiers = _parseModifiers(aEvent);
-
-    var rect = aTarget.getBoundingClientRect();
-
-    var left = rect.left + aOffsetX;
-    var top = rect.top + aOffsetY;
-
-    if (("type" in aEvent) && aEvent.type) {
-      utils.sendMouseEvent(aEvent.type, left, top, button, clickCount, modifiers);
-    }
-    else {
-      utils.sendMouseEvent("mousedown", left, top, button, clickCount, modifiers);
-      utils.sendMouseEvent("mouseup", left, top, button, clickCount, modifiers);
-    }
-  }
-}
-
-/**
- * Synthesize a mouse scroll event on a target. The actual client point is determined
- * by taking the aTarget's client box and offseting it by aOffsetX and
- * aOffsetY.
- *
- * aEvent is an object which may contain the properties:
- *   shiftKey, ctrlKey, altKey, metaKey, accessKey, button, type, axis, delta, hasPixels
- *
- * If the type is specified, a mouse scroll event of that type is fired. Otherwise,
- * "DOMMouseScroll" is used.
- *
- * If the axis is specified, it must be one of "horizontal" or "vertical". If not specified,
- * "vertical" is used.
- *
- * 'delta' is the amount to scroll by (can be positive or negative). It must
- * be specified.
- *
- * 'hasPixels' specifies whether kHasPixels should be set in the scrollFlags.
- *
- * aWindow is optional, and defaults to the current window object.
- */
-function synthesizeMouseScroll(aTarget, aOffsetX, aOffsetY, aEvent, aWindow)
-{
-  if (!aWindow)
-    aWindow = window;
-
-  var utils = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                      getInterface(Components.interfaces.nsIDOMWindowUtils);
-  if (utils) {
-    // See nsMouseScrollFlags in nsGUIEvent.h
-    const kIsVertical = 0x02;
-    const kIsHorizontal = 0x04;
-    const kHasPixels = 0x08;
-
-    var button = aEvent.button || 0;
-    var modifiers = _parseModifiers(aEvent);
-
-    var rect = aTarget.getBoundingClientRect();
-
-    var left = rect.left;
-    var top = rect.top;
-
-    var type = (("type" in aEvent) && aEvent.type) || "DOMMouseScroll";
-    var axis = aEvent.axis || "vertical";
-    var scrollFlags = (axis == "horizontal") ? kIsHorizontal : kIsVertical;
-    if (aEvent.hasPixels) {
-      scrollFlags |= kHasPixels;
-    }
-    utils.sendMouseScrollEvent(type, left + aOffsetX, top + aOffsetY, button,
-                               scrollFlags, aEvent.delta, modifiers);
-  }
-}
-
-/**
- * Synthesize a key event. It is targeted at whatever would be targeted by an
- * actual keypress by the user, typically the focused element.
- *
- * aKey should be either a character or a keycode starting with VK_ such as
- * VK_ENTER.
- *
- * aEvent is an object which may contain the properties:
- *   shiftKey, ctrlKey, altKey, metaKey, accessKey, type
- *
- * If the type is specified, a key event of that type is fired. Otherwise,
- * a keydown, a keypress and then a keyup event are fired in sequence.
- *
- * aWindow is optional, and defaults to the current window object.
- */
-function synthesizeKey(aKey, aEvent, aWindow)
-{
-  if (!aWindow)
-    aWindow = window;
-
-  var utils = aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                      getInterface(Components.interfaces.nsIDOMWindowUtils);
-  if (utils) {
-    var keyCode = 0, charCode = 0;
-    if (aKey.indexOf("VK_") == 0)
-      keyCode = getKeyEvent(aWindow)["DOM_" + aKey];
-    else
-      charCode = aKey.charCodeAt(0);
-
-    var modifiers = _parseModifiers(aEvent);
-
-    if (!("type" in aEvent) || !aEvent.type) {
-      // Send keydown + keypress + keyup events.
-      var keyDownDefaultHappened =
-          utils.sendKeyEvent("keydown", keyCode, charCode, modifiers);
-      utils.sendKeyEvent("keypress", keyCode, charCode, modifiers,
-                         !keyDownDefaultHappened);
-      utils.sendKeyEvent("keyup", keyCode, charCode, modifiers);
-    } else {
-      // Send standalone event.
-      utils.sendKeyEvent(aEvent.type, keyCode, charCode, modifiers);
-    }
-  }
-}
-
-var _gSeenEvent = false;
-
-/**
- * Indicate that an event with an original target of aExpectedTarget and
- * a type of aExpectedEvent is expected to be fired, or not expected to
- * be fired.
- */
-function _expectEvent(aExpectedTarget, aExpectedEvent, aTestName)
-{
-  if (!aExpectedTarget || !aExpectedEvent)
-    return null;
-
-  _gSeenEvent = false;
-
-  var type = (aExpectedEvent.charAt(0) == "!") ?
-             aExpectedEvent.substring(1) : aExpectedEvent;
-  var eventHandler = function(event) {
-    var epassed = (!_gSeenEvent && event.originalTarget == aExpectedTarget &&
-                   event.type == type);
-    if (!epassed)
-      throw new Error(aTestName + " " + type + " event target " +
-                      (_gSeenEvent ? "twice" : ""));
-    _gSeenEvent = true;
-  };
-
-  aExpectedTarget.addEventListener(type, eventHandler, false);
-  return eventHandler;
-}
-
-/**
- * Check if the event was fired or not. The event handler aEventHandler
- * will be removed.
- */
-function _checkExpectedEvent(aExpectedTarget, aExpectedEvent, aEventHandler, aTestName)
-{
-  if (aEventHandler) {
-    var expectEvent = (aExpectedEvent.charAt(0) != "!");
-    var type = expectEvent ? aExpectedEvent : aExpectedEvent.substring(1);
-    aExpectedTarget.removeEventListener(type, aEventHandler, false);
-    var desc = type + " event";
-    if (expectEvent)
-      desc += " not";
-    if (_gSeenEvent != expectEvent)
-      throw new Error(aTestName + ": " + desc + " fired.");
-  }
-
-  _gSeenEvent = false;
-}
-
-/**
- * Similar to synthesizeMouse except that a test is performed to see if an
- * event is fired at the right target as a result.
- *
- * aExpectedTarget - the expected originalTarget of the event.
- * aExpectedEvent - the expected type of the event, such as 'select'.
- * aTestName - the test name when outputing results
- *
- * To test that an event is not fired, use an expected type preceded by an
- * exclamation mark, such as '!select'. This might be used to test that a
- * click on a disabled element doesn't fire certain events for instance.
- *
- * aWindow is optional, and defaults to the current window object.
- */
-function synthesizeMouseExpectEvent(aTarget, aOffsetX, aOffsetY, aEvent,
-                                    aExpectedTarget, aExpectedEvent, aTestName,
-                                    aWindow)
-{
-  var eventHandler = _expectEvent(aExpectedTarget, aExpectedEvent, aTestName);
-  synthesizeMouse(aTarget, aOffsetX, aOffsetY, aEvent, aWindow);
-  _checkExpectedEvent(aExpectedTarget, aExpectedEvent, eventHandler, aTestName);
-}
-
-/**
- * Similar to synthesizeKey except that a test is performed to see if an
- * event is fired at the right target as a result.
- *
- * aExpectedTarget - the expected originalTarget of the event.
- * aExpectedEvent - the expected type of the event, such as 'select'.
- * aTestName - the test name when outputing results
- *
- * To test that an event is not fired, use an expected type preceded by an
- * exclamation mark, such as '!select'.
- *
- * aWindow is optional, and defaults to the current window object.
- */
-function synthesizeKeyExpectEvent(key, aEvent, aExpectedTarget, aExpectedEvent,
-                                  aTestName, aWindow)
-{
-  var eventHandler = _expectEvent(aExpectedTarget, aExpectedEvent, aTestName);
-  synthesizeKey(key, aEvent, aWindow);
-  _checkExpectedEvent(aExpectedTarget, aExpectedEvent, eventHandler, aTestName);
-}
-
-/**
- * Emulate a dragstart event.
- *  element - element to fire the dragstart event on
- *  expectedDragData - the data you expect the data transfer to contain afterwards
- *                      This data is in the format:
- *                         [ [ {type: value, data: value, test: function}, ... ], ... ]
- *                     can be null
- *  aWindow - optional; defaults to the current window object.
- *  x - optional; initial x coordinate
- *  y - optional; initial y coordinate
- * Returns null if data matches.
- * Returns the event.dataTransfer if data does not match
- *
- * eqTest is an optional function if comparison can't be done with x == y;
- *   function (actualData, expectedData) {return boolean}
- *   @param actualData from dataTransfer
- *   @param expectedData from expectedDragData
- * see bug 462172 for example of use
- *
- */
-function synthesizeDragStart(element, expectedDragData, aWindow, x, y)
-{
-  if (!aWindow)
-    aWindow = window;
-  x = x || 2;
-  y = y || 2;
-  const step = 9;
-
-  var result = "trapDrag was not called";
-  var trapDrag = function(event) {
-    try {
-      var dataTransfer = event.dataTransfer;
-      result = null;
-      if (!dataTransfer)
-        throw "no dataTransfer";
-      if (expectedDragData == null ||
-          dataTransfer.mozItemCount != expectedDragData.length)
-        throw dataTransfer;
-      for (var i = 0; i < dataTransfer.mozItemCount; i++) {
-        var dtTypes = dataTransfer.mozTypesAt(i);
-        if (dtTypes.length != expectedDragData[i].length)
-          throw dataTransfer;
-        for (var j = 0; j < dtTypes.length; j++) {
-          if (dtTypes[j] != expectedDragData[i][j].type)
-            throw dataTransfer;
-          var dtData = dataTransfer.mozGetDataAt(dtTypes[j],i);
-          if (expectedDragData[i][j].eqTest) {
-            if (!expectedDragData[i][j].eqTest(dtData, expectedDragData[i][j].data))
-              throw dataTransfer;
-          }
-          else if (expectedDragData[i][j].data != dtData)
-            throw dataTransfer;
-        }
-      }
-    } catch(ex) {
-      result = ex;
-    }
-    event.preventDefault();
-    event.stopPropagation();
-  }
-  aWindow.addEventListener("dragstart", trapDrag, false);
-  synthesizeMouse(element, x, y, { type: "mousedown" }, aWindow);
-  x += step; y += step;
-  synthesizeMouse(element, x, y, { type: "mousemove" }, aWindow);
-  x += step; y += step;
-  synthesizeMouse(element, x, y, { type: "mousemove" }, aWindow);
-  aWindow.removeEventListener("dragstart", trapDrag, false);
-  synthesizeMouse(element, x, y, { type: "mouseup" }, aWindow);
-  return result;
-}
-
-/**
- * Emulate a drop by emulating a dragstart and firing events dragenter, dragover, and drop.
- *  srcElement - the element to use to start the drag, usually the same as destElement
- *               but if destElement isn't suitable to start a drag on pass a suitable
- *               element for srcElement
- *  destElement - the element to fire the dragover, dragleave and drop events
- *  dragData - the data to supply for the data transfer
- *                     This data is in the format:
- *                       [ [ {type: value, data: value}, ...], ... ]
- *  dropEffect - the drop effect to set during the dragstart event, or 'move' if null
- *  aWindow - optional; defaults to the current window object.
- *
- * Returns the drop effect that was desired.
- */
-function synthesizeDrop(srcElement, destElement, dragData, dropEffect, aWindow)
-{
-  if (!aWindow)
-    aWindow = window;
-
-  var dataTransfer;
-  var trapDrag = function(event) {
-    dataTransfer = event.dataTransfer;
-    for (var i = 0; i < dragData.length; i++) {
-      var item = dragData[i];
-      for (var j = 0; j < item.length; j++) {
-        dataTransfer.mozSetDataAt(item[j].type, item[j].data, i);
-      }
-    }
-    dataTransfer.dropEffect = dropEffect || "move";
-    event.preventDefault();
-    event.stopPropagation();
-  }
-
-  // need to use real mouse action
-  aWindow.addEventListener("dragstart", trapDrag, true);
-  synthesizeMouse(srcElement, 2, 2, { type: "mousedown" }, aWindow);
-  synthesizeMouse(srcElement, 11, 11, { type: "mousemove" }, aWindow);
-  synthesizeMouse(srcElement, 20, 20, { type: "mousemove" }, aWindow);
-  aWindow.removeEventListener("dragstart", trapDrag, true);
-
-  event = aWindow.document.createEvent("DragEvents");
-  event.initDragEvent("dragenter", true, true, aWindow, 0, 0, 0, 0, 0, false, false, false, false, 0, null, dataTransfer);
-  destElement.dispatchEvent(event);
-
-  var event = aWindow.document.createEvent("DragEvents");
-  event.initDragEvent("dragover", true, true, aWindow, 0, 0, 0, 0, 0, false, false, false, false, 0, null, dataTransfer);
-  if (destElement.dispatchEvent(event)) {
-    synthesizeMouse(destElement, 20, 20, { type: "mouseup" }, aWindow);
-    return "none";
-  }
-
-  if (dataTransfer.dropEffect != "none") {
-    event = aWindow.document.createEvent("DragEvents");
-    event.initDragEvent("drop", true, true, aWindow, 0, 0, 0, 0, 0, false, false, false, false, 0, null, dataTransfer);
-    destElement.dispatchEvent(event);
-  }
-  synthesizeMouse(destElement, 20, 20, { type: "mouseup" }, aWindow);
-
-  return dataTransfer.dropEffect;
-}
-
-function disableNonTestMouseEvents(aDisable)
-{
-  var utils =
-    window.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-           getInterface(Components.interfaces.nsIDOMWindowUtils);
-  if (utils)
-    utils.disableNonTestMouseEvents(aDisable);
-}
-
-function _getDOMWindowUtils(aWindow)
-{
-  if (!aWindow) {
-    aWindow = window;
-  }
-  return aWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor).
-                 getInterface(Components.interfaces.nsIDOMWindowUtils);
-}
-
-/**
- * Synthesize a composition event.
- *
- * @param aIsCompositionStart  If true, this synthesize compositionstart event.
- *                             Otherwise, compositionend event.
- * @param aWindow              Optional (If null, current |window| will be used)
- */
-function synthesizeComposition(aIsCompositionStart, aWindow)
-{
-  var utils = _getDOMWindowUtils(aWindow);
-  if (!utils) {
-    return;
-  }
-
-  utils.sendCompositionEvent(aIsCompositionStart ?
-                               "compositionstart" : "compositionend");
-}
-
-/**
- * Synthesize a text event.
- *
- * @param aEvent   The text event's information, this has |composition|
- *                 and |caret| members.  |composition| has |string| and
- *                 |clauses| members.  |clauses| must be array object.  Each
- *                 object has |length| and |attr|.  And |caret| has |start| and
- *                 |length|.  See the following tree image.
- *
- *                 aEvent
- *                   +-- composition
- *                   |     +-- string
- *                   |     +-- clauses[]
- *                   |           +-- length
- *                   |           +-- attr
- *                   +-- caret
- *                         +-- start
- *                         +-- length
- *
- *                 Set the composition string to |composition.string|.  Set its
- *                 clauses information to the |clauses| array.
- *
- *                 When it's composing, set the each clauses' length to the
- *                 |composition.clauses[n].length|.  The sum of the all length
- *                 values must be same as the length of |composition.string|.
- *                 Set nsIDOMWindowUtils.COMPOSITION_ATTR_* to the
- *                 |composition.clauses[n].attr|.
- *
- *                 When it's not composing, set 0 to the
- *                 |composition.clauses[0].length| and
- *                 |composition.clauses[0].attr|.
- *
- *                 Set caret position to the |caret.start|. It's offset from
- *                 the start of the composition string.  Set caret length to
- *                 |caret.length|.  If it's larger than 0, it should be wide
- *                 caret.  However, current nsEditor doesn't support wide
- *                 caret, therefore, you should always set 0 now.
- *
- * @param aWindow  Optional (If null, current |window| will be used)
- */
-function synthesizeText(aEvent, aWindow)
-{
-  var utils = _getDOMWindowUtils(aWindow);
-  if (!utils) {
-    return;
-  }
-
-  if (!aEvent.composition || !aEvent.composition.clauses ||
-      !aEvent.composition.clauses[0]) {
-    return;
-  }
-
-  var firstClauseLength = aEvent.composition.clauses[0].length;
-  var firstClauseAttr   = aEvent.composition.clauses[0].attr;
-  var secondClauseLength = 0;
-  var secondClauseAttr = 0;
-  var thirdClauseLength = 0;
-  var thirdClauseAttr = 0;
-  if (aEvent.composition.clauses[1]) {
-    secondClauseLength = aEvent.composition.clauses[1].length;
-    secondClauseAttr   = aEvent.composition.clauses[1].attr;
-    if (aEvent.composition.clauses[2]) {
-      thirdClauseLength = aEvent.composition.clauses[2].length;
-      thirdClauseAttr   = aEvent.composition.clauses[2].attr;
-    }
-  }
-
-  var caretStart = -1;
-  var caretLength = 0;
-  if (aEvent.caret) {
-    caretStart = aEvent.caret.start;
-    caretLength = aEvent.caret.length;
-  }
-
-  utils.sendTextEvent(aEvent.composition.string,
-                      firstClauseLength, firstClauseAttr,
-                      secondClauseLength, secondClauseAttr,
-                      thirdClauseLength, thirdClauseAttr,
-                      caretStart, caretLength);
-}
-
-/**
- * Synthesize a query selected text event.
- *
- * @param aWindow  Optional (If null, current |window| will be used)
- * @return         An nsIQueryContentEventResult object.  If this failed,
- *                 the result might be null.
- */
-function synthesizeQuerySelectedText(aWindow)
-{
-  var utils = _getDOMWindowUtils(aWindow);
-  if (!utils) {
-    return null;
-  }
-
-  return utils.sendQueryContentEvent(utils.QUERY_SELECTED_TEXT, 0, 0, 0, 0);
-}
-
-/**
- * Synthesize a query text content event.
- *
- * @param aOffset  The character offset.  0 means the first character in the
- *                 selection root.
- * @param aLength  The length of getting text.  If the length is too long,
- *                 the extra length is ignored.
- * @param aWindow  Optional (If null, current |window| will be used)
- * @return         An nsIQueryContentEventResult object.  If this failed,
- *                 the result might be null.
- */
-function synthesizeQueryTextContent(aOffset, aLength, aWindow)
-{
-  var utils = _getDOMWindowUtils(aWindow);
-  if (!utils) {
-    return null;
-  }
-
-  return utils.sendQueryContentEvent(utils.QUERY_TEXT_CONTENT,
-                                     aOffset, aLength, 0, 0);
-}
-
-/**
- * Synthesize a query caret rect event.
- *
- * @param aOffset  The caret offset.  0 means left side of the first character
- *                 in the selection root.
- * @param aWindow  Optional (If null, current |window| will be used)
- * @return         An nsIQueryContentEventResult object.  If this failed,
- *                 the result might be null.
- */
-function synthesizeQueryCaretRect(aOffset, aWindow)
-{
-  var utils = _getDOMWindowUtils(aWindow);
-  if (!utils) {
-    return null;
-  }
-
-  return utils.sendQueryContentEvent(utils.QUERY_CARET_RECT,
-                                     aOffset, 0, 0, 0);
-}
-
-/**
- * Synthesize a query text rect event.
- *
- * @param aOffset  The character offset.  0 means the first character in the
- *                 selection root.
- * @param aLength  The length of the text.  If the length is too long,
- *                 the extra length is ignored.
- * @param aWindow  Optional (If null, current |window| will be used)
- * @return         An nsIQueryContentEventResult object.  If this failed,
- *                 the result might be null.
- */
-function synthesizeQueryTextRect(aOffset, aLength, aWindow)
-{
-  var utils = _getDOMWindowUtils(aWindow);
-  if (!utils) {
-    return null;
-  }
-
-  return utils.sendQueryContentEvent(utils.QUERY_TEXT_RECT,
-                                     aOffset, aLength, 0, 0);
-}
-
-/**
- * Synthesize a query editor rect event.
- *
- * @param aWindow  Optional (If null, current |window| will be used)
- * @return         An nsIQueryContentEventResult object.  If this failed,
- *                 the result might be null.
- */
-function synthesizeQueryEditorRect(aWindow)
-{
-  var utils = _getDOMWindowUtils(aWindow);
-  if (!utils) {
-    return null;
-  }
-
-  return utils.sendQueryContentEvent(utils.QUERY_EDITOR_RECT, 0, 0, 0, 0);
-}
-
-/**
- * Synthesize a character at point event.
- *
- * @param aX, aY   The offset in the client area of the DOM window.
- * @param aWindow  Optional (If null, current |window| will be used)
- * @return         An nsIQueryContentEventResult object.  If this failed,
- *                 the result might be null.
- */
-function synthesizeCharAtPoint(aX, aY, aWindow)
-{
-  var utils = _getDOMWindowUtils(aWindow);
-  if (!utils) {
-    return null;
-  }
-
-  return utils.sendQueryContentEvent(utils.QUERY_CHARACTER_AT_POINT,
-                                     0, 0, aX, aY);
-}
-
-/**
- * Synthesize a selection set event.
- *
- * @param aOffset  The character offset.  0 means the first character in the
- *                 selection root.
- * @param aLength  The length of the text.  If the length is too long,
- *                 the extra length is ignored.
- * @param aReverse If true, the selection is from |aOffset + aLength| to
- *                 |aOffset|.  Otherwise, from |aOffset| to |aOffset + aLength|.
- * @param aWindow  Optional (If null, current |window| will be used)
- * @return         True, if succeeded.  Otherwise false.
- */
-function synthesizeSelectionSet(aOffset, aLength, aReverse, aWindow)
-{
-  var utils = _getDOMWindowUtils(aWindow);
-  if (!utils) {
-    return false;
-  }
-
-  return utils.sendSelectionSetEvent(aOffset, aLength, aReverse);
-}