From 2e9233c5f5ef20e8dd8b7c42a85092e71361851d Mon Sep 17 00:00:00 2001
From: Jim Mathies <jmathies@mozilla.com>
Date: Thu, 13 Jun 2013 09:37:15 -0500
Subject: [PATCH] Bug 880739 - add some debug logging to
 browser_context_menu_tests.js. r=bbondy

---
 .../mochitest/browser_context_menu_tests.js   | 44 +++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/browser/metro/base/tests/mochitest/browser_context_menu_tests.js b/browser/metro/base/tests/mochitest/browser_context_menu_tests.js
index 333d3613a50..00f226e8854 100644
--- a/browser/metro/base/tests/mochitest/browser_context_menu_tests.js
+++ b/browser/metro/base/tests/mochitest/browser_context_menu_tests.js
@@ -352,12 +352,48 @@ gTests.push({
   }
 });
 
+var observeLogger = {
+  observe: function (aSubject, aTopic, aData) {
+    info("observeLogger: " + aTopic);
+  },
+  QueryInterface: function (aIID) {
+    if (!aIID.equals(Ci.nsIObserver) &&
+        !aIID.equals(Ci.nsISupportsWeakReference) &&
+        !aIID.equals(Ci.nsISupports)) {
+      throw Components.results.NS_ERROR_NO_INTERFACE;
+    }
+    return this;
+  },
+  init: function init() {
+    Services.obs.addObserver(observeLogger, "dl-start", true);
+    Services.obs.addObserver(observeLogger, "dl-done", true);
+    Services.obs.addObserver(observeLogger, "dl-failed", true);
+    Services.obs.addObserver(observeLogger, "dl-scanning", true);
+    Services.obs.addObserver(observeLogger, "dl-blocked", true);
+    Services.obs.addObserver(observeLogger, "dl-dirty", true);
+    Services.obs.addObserver(observeLogger, "dl-cancel", true);
+  },
+  shutdown: function shutdown() {
+    Services.obs.removeObserver(observeLogger, "dl-start");
+    Services.obs.removeObserver(observeLogger, "dl-done");
+    Services.obs.removeObserver(observeLogger, "dl-failed");
+    Services.obs.removeObserver(observeLogger, "dl-scanning");
+    Services.obs.removeObserver(observeLogger, "dl-blocked");
+    Services.obs.removeObserver(observeLogger, "dl-dirty");
+    Services.obs.removeObserver(observeLogger, "dl-cancel");
+  }
+}
+
 // Image context menu tests
 gTests.push({
   desc: "image context menu",
+  setUp: function() {
+    observeLogger.init();
+  },
+  tearDown: function() {
+    observeLogger.shutdown();
+  },
   run: function test() {
-    netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-
     info(chromeRoot + "browser_context_menu_tests_01.html");
     yield addTab(chromeRoot + "browser_context_menu_tests_01.html");
 
@@ -409,7 +445,9 @@ gTests.push({
     ok(menuItem, "menu item exists");
     ok(!menuItem.hidden, "menu item visible");
 
-    let downloadPromise = waitForObserver("dl-done", 5000);
+    // dl-start, dl-failed, dl-scanning, dl-blocked, dl-dirty, dl-cancel
+    let downloadPromise = waitForObserver("dl-done", 10000);
+
     let popupPromise = waitForEvent(document, "popuphidden");
     EventUtils.synthesizeMouse(menuItem, 10, 10, {}, win);
     yield popupPromise;