From 226bf1e3c63cecef2be30922edabc76a53e2ce9c Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Fri, 12 Sep 2014 11:42:14 +0100
Subject: [PATCH] Bug 1066394 - fix intermittent load events in
 browser_967000_button_sync.js, r=markh

---
 .../customizableui/test/browser_967000_button_sync.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/browser/components/customizableui/test/browser_967000_button_sync.js b/browser/components/customizableui/test/browser_967000_button_sync.js
index eaf5110c6d4..5dc6a016777 100644
--- a/browser/components/customizableui/test/browser_967000_button_sync.js
+++ b/browser/components/customizableui/test/browser_967000_button_sync.js
@@ -30,11 +30,16 @@ function openAboutAccountsFromMenuPanel(entryPoint) {
   ok(syncButton, "The Sync button was added to the Panel Menu");
 
   let deferred = Promise.defer();
-  let handler = () => {
-    gBrowser.selectedTab.removeEventListener("load", handler, true);
+  let handler = (e) => {
+    if (e.originalTarget != gBrowser.selectedTab.linkedBrowser.contentDocument ||
+        e.target.location.href == "about:blank") {
+      info("Skipping spurious 'load' event for " + e.target.location.href);
+      return;
+    }
+    gBrowser.selectedTab.linkedBrowser.removeEventListener("load", handler, true);
     deferred.resolve();
   }
-  gBrowser.selectedTab.addEventListener("load", handler, true);
+  gBrowser.selectedTab.linkedBrowser.addEventListener("load", handler, true);
 
   syncButton.click();
   yield deferred.promise;