Bug 1336124 - Remove unused B2G code in session teardown; r?maja_zf
MozReview-Commit-ID: CHmdB7BvBT8
--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -2174,39 +2174,32 @@ GeckoDriver.prototype.closeChromeWindow
*
* If it is a B2G environment, it will make the main content listener
* sleep, and close all other listeners. The main content listener
* persists after disconnect (it's the homescreen), and can safely
* be reused.
*/
GeckoDriver.prototype.sessionTearDown = function (cmd, resp) {
if (this.curBrowser !== null) {
- if (this.appName == "B2G") {
- globalMessageManager.broadcastAsyncMessage(
- "Marionette:sleepSession" + this.curBrowser.mainContentId, {});
- this.curBrowser.knownFrames.splice(
- this.curBrowser.knownFrames.indexOf(this.curBrowser.mainContentId), 1);
- } else {
- // don't set this pref for B2G since the framescript can be safely reused
- Preferences.set(CONTENT_LISTENER_PREF, false);
- }
+ // frame scripts can be safely reused
+ Preferences.set(CONTENT_LISTENER_PREF, false);
// delete session in each frame in each browser
for (let win in this.browsers) {
let browser = this.browsers[win];
for (let i in browser.knownFrames) {
globalMessageManager.broadcastAsyncMessage(
"Marionette:deleteSession" + browser.knownFrames[i], {});
}
}
let winEn = Services.wm.getEnumerator(null);
while (winEn.hasMoreElements()) {
let win = winEn.getNext();
- if (win.messageManager){
+ if (win.messageManager) {
win.messageManager.removeDelayedFrameScript(FRAME_SCRIPT);
} else {
logger.error(
`Could not remove listener from page ${win.location.href}`);
}
}
this.curBrowser.frameManager.removeMessageManagerListeners(