--- a/testing/marionette/listener.js
+++ b/testing/marionette/listener.js
@@ -273,17 +273,16 @@ function startListeners() {
addMessageListenerId("Marionette:isElementSelected", isElementSelectedFn);
addMessageListenerId("Marionette:sendKeysToElement", sendKeysToElement);
addMessageListenerId("Marionette:clearElement", clearElementFn);
addMessageListenerId("Marionette:switchToFrame", switchToFrame);
addMessageListenerId("Marionette:switchToParentFrame", switchToParentFrame);
addMessageListenerId("Marionette:switchToShadowRoot", switchToShadowRootFn);
addMessageListenerId("Marionette:deleteSession", deleteSession);
addMessageListenerId("Marionette:sleepSession", sleepSession);
- addMessageListenerId("Marionette:emulatorCmdResult", emulatorCmdResult);
addMessageListenerId("Marionette:getAppCacheStatus", getAppCacheStatus);
addMessageListenerId("Marionette:setTestName", setTestName);
addMessageListenerId("Marionette:takeScreenshot", takeScreenshotFn);
addMessageListenerId("Marionette:getScreenshotHash", getScreenshotHashFn);
addMessageListenerId("Marionette:addCookie", addCookieFn);
addMessageListenerId("Marionette:getCookies", getCookiesFn);
addMessageListenerId("Marionette:deleteAllCookies", deleteAllCookiesFn);
addMessageListenerId("Marionette:deleteCookie", deleteCookieFn);
@@ -378,17 +377,16 @@ function deleteSession(msg) {
removeMessageListenerId("Marionette:isElementSelected", isElementSelectedFn);
removeMessageListenerId("Marionette:sendKeysToElement", sendKeysToElement);
removeMessageListenerId("Marionette:clearElement", clearElementFn);
removeMessageListenerId("Marionette:switchToFrame", switchToFrame);
removeMessageListenerId("Marionette:switchToParentFrame", switchToParentFrame);
removeMessageListenerId("Marionette:switchToShadowRoot", switchToShadowRootFn);
removeMessageListenerId("Marionette:deleteSession", deleteSession);
removeMessageListenerId("Marionette:sleepSession", sleepSession);
- removeMessageListenerId("Marionette:emulatorCmdResult", emulatorCmdResult);
removeMessageListenerId("Marionette:getAppCacheStatus", getAppCacheStatus);
removeMessageListenerId("Marionette:setTestName", setTestName);
removeMessageListenerId("Marionette:takeScreenshot", takeScreenshotFn);
removeMessageListenerId("Marionette:getScreenshotHash", getScreenshotHashFn);
removeMessageListenerId("Marionette:addCookie", addCookieFn);
removeMessageListenerId("Marionette:getCookies", getCookiesFn);
removeMessageListenerId("Marionette:deleteAllCookies", deleteAllCookiesFn);
removeMessageListenerId("Marionette:deleteCookie", deleteCookieFn);
@@ -1465,64 +1463,16 @@ function deleteAllCookies() {
}
}
function getAppCacheStatus(msg) {
sendResponse(
curContainer.frame.applicationCache.status, msg.json.command_id);
}
-// emulator callbacks
-var _emu_cb_id = 0;
-var _emu_cbs = {};
-
-function runEmulatorCmd(cmd, callback) {
- if (callback) {
- _emu_cbs[_emu_cb_id] = callback;
- }
- sendAsyncMessage("Marionette:runEmulatorCmd",
- {command: cmd, id: _emu_cb_id});
- _emu_cb_id += 1;
-}
-
-function runEmulatorShell(args, callback) {
- if (callback) {
- _emu_cbs[_emu_cb_id] = callback;
- }
- sendAsyncMessage("Marionette:runEmulatorShell",
- {arguments: args, id: _emu_cb_id});
- _emu_cb_id += 1;
-}
-
-function emulatorCmdResult(msg) {
- let {error, result, id} = msg.json;
-
- if (error) {
- let err = new JavaScriptError(error);
- sendError(err, id);
- return;
- }
-
- if (!sandboxes[sandboxName]) {
- return;
- }
- let cb = _emu_cbs[id];
- delete _emu_cbs[id];
- if (!cb) {
- return;
- }
-
- try {
- cb(result);
- } catch (e) {
- let err = new JavaScriptError(e);
- sendError(err, id);
- }
-}
-
/**
* Perform a screen capture in content context.
*
* @param {UUID=} id
* Optional web element reference of an element to take a screenshot
* of.
* @param {boolean=} full
* True to take a screenshot of the entire document element. Is not