Merge backout of changeset 6a5f22ccbe0e (no bug) to see if it is the cause of the mozilla-browser-chrome orange (bug 507605 and bug 507698) CLOSED TREE

browser/components/sessionstore/test/browser/browser_483330.js

@@ -10,7 +10,7 @@ function test() {
 
   let browser = tab.linkedBrowser;
   browser.addEventListener("load", function loadListener(e) {
-    browser.removeEventListener("load", arguments.callee, true);
+    browser.removeEventListener("load", arguments.callee, false);
 
     // Scroll the content document
     browser.contentWindow.scrollTo(1100, 1200);
@@ -21,7 +21,7 @@ function test() {
 
     let newTab = ss.undoCloseTab(window, 0);
     newTab.addEventListener("SSTabRestored", function tabRestored(e) {
-      newTab.removeEventListener("SSTabRestored", arguments.callee, true);
+      newTab.removeEventListener("SSTabRestored", arguments.callee, false);
 
       let newBrowser = newTab.linkedBrowser;
 

browser/components/sessionstore/test/browser/browser_491168.js

@@ -61,13 +61,13 @@ function test() {
     ss.setTabState(tab, JSON.stringify(tabState));
 
     tab.addEventListener("SSTabRestored", function() {
-      tab.removeEventListener("SSTabRestored", arguments.callee, true);
+      tab.removeEventListener("SSTabRestored", arguments.callee, false);
       is(window.content.document.referrer, REFERRER2, "document.referrer matches referrer set via setTabState.");
 
       gBrowser.removeTab(tab);
       let newTab = ss.undoCloseTab(window, 0);
       newTab.addEventListener("SSTabRestored", function() {
-        newTab.removeEventListener("SSTabRestored", arguments.callee, true);
+        newTab.removeEventListener("SSTabRestored", arguments.callee, false);
 
         is(window.content.document.referrer, REFERRER2, "document.referrer is still correct after closing and reopening the tab.");
         gBrowser.removeTab(newTab);