From 5b5a2ab891b98525c34cda4935b5f98dfa6e0fa0 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Thu, 19 Nov 2009 14:15:01 +0100
Subject: [PATCH] Bug 521889 - browser_461743.js is randomly timing out,
 r=zeniko

---
 .../test/browser/browser_461743.js            | 51 +++++++++----------
 .../test/browser/browser_461743_sample.html   | 20 +++++---
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/browser/components/sessionstore/test/browser/browser_461743.js b/browser/components/sessionstore/test/browser/browser_461743.js
index 702ca7ce918..744480608cf 100644
--- a/browser/components/sessionstore/test/browser/browser_461743.js
+++ b/browser/components/sessionstore/test/browser/browser_461743.js
@@ -36,37 +36,36 @@
 
 function test() {
   /** Test for Bug 461743 **/
-  
+
   waitForExplicitFinish();
-  
+
   let testURL = "http://localhost:8888/browser/" +
     "browser/components/sessionstore/test/browser/browser_461743_sample.html";
-  
+
+  let frameCount = 0;
   let tab = gBrowser.addTab(testURL);
-  info("New tab added");
   tab.linkedBrowser.addEventListener("load", function(aEvent) {
-    info("New tab loaded");
+    // Wait for all frames to load completely.
+    if (frameCount++ < 2)
+      return;
     tab.linkedBrowser.removeEventListener("load", arguments.callee, true);
-    executeSoon(function() {
-      let tab2 = gBrowser.duplicateTab(tab);
-      info("Duplicated tab");
-      tab2.linkedBrowser.addEventListener("461743", function(aEvent) {
-        tab2.linkedBrowser.removeEventListener("461743", arguments.callee, true);
-        is(aEvent.data, "done", "XSS injection was attempted");
-        
-        executeSoon(function() {
-          let iframes = tab2.linkedBrowser.contentWindow.frames;
-          let innerHTML = iframes[1].document.body.innerHTML;
-          isnot(innerHTML, Components.utils.reportError.toString(),
-                "chrome access denied!");
-          
-          // clean up
-          gBrowser.removeTab(tab2);
-          gBrowser.removeTab(tab);
-          
-          finish();
-        });
-      }, true, true);
-    });
+    let tab2 = gBrowser.duplicateTab(tab);
+    tab2.linkedBrowser.addEventListener("461743", function(aEvent) {
+      tab2.linkedBrowser.removeEventListener("461743", arguments.callee, true);
+      is(aEvent.data, "done", "XSS injection was attempted");
+
+      executeSoon(function() {
+        let iframes = tab2.linkedBrowser.contentWindow.frames;
+        let innerHTML = iframes[1].document.body.innerHTML;
+        isnot(innerHTML, Components.utils.reportError.toString(),
+              "chrome access denied!");
+
+        // Clean up.
+        gBrowser.removeTab(tab2);
+        gBrowser.removeTab(tab);
+
+        finish();
+      });
+    }, true, true);
   }, true);
 }
diff --git a/browser/components/sessionstore/test/browser/browser_461743_sample.html b/browser/components/sessionstore/test/browser/browser_461743_sample.html
index 4150ede3236..e2d41634e68 100644
--- a/browser/components/sessionstore/test/browser/browser_461743_sample.html
+++ b/browser/components/sessionstore/test/browser/browser_461743_sample.html
@@ -10,17 +10,25 @@
 <script type="application/javascript">
   var chromeUrl = "chrome://global/content/mozilla.xhtml";
   var exploitUrl = "javascript:try { document.body.innerHTML = Components.utils.reportError; } catch (ex) { }";
-  
-  window.onload = function() {
+
+  var loadCount = 0;
+  frames[0].addEventListener("DOMContentLoaded", handleLoad, false);
+  frames[1].addEventListener("DOMContentLoaded", handleLoad, false);
+  function handleLoad() {
+    if (++loadCount < 2)
+      return;
+    frames[0].removeEventListener("DOMContentLoaded", handleLoad, false);
+    frames[1].removeEventListener("DOMContentLoaded", handleLoad, false);
+
     var flip = 0;
     MutationEvent.prototype.toString = function() {
       return flip++ == 0 ? chromeUrl : exploitUrl;
     };
-    
+
     var href = Components.lookupMethod(frames[1].location, "href");
     var loadChrome = { handleEvent: href };
     var loadExploit = { handleEvent: href };
-    
+
     function delay() {
       var xhr = new XMLHttpRequest();
       xhr.open("GET", location.href, false);
@@ -35,12 +43,12 @@
       frames[0].document.removeEventListener("DOMNodeInserted", loadExploit, true);
       frames[0].document.removeEventListener("DOMNodeInserted", done, true);
     }
-    
+
     frames[0].document.addEventListener("DOMNodeInserted", loadChrome, true);
     frames[0].document.addEventListener("DOMNodeInserted", delay, true);
     frames[0].document.addEventListener("DOMNodeInserted", loadExploit, true);
     frames[0].document.addEventListener("DOMNodeInserted", done, true);
-    
+
     frames[0].document.designMode = "on";
   };
 </script>