Bug 650410 - Test for bug 383369 uses a timeout because it doesn't know how to use the download manager API!; r=sdwilsh

--HG--
extra : rebase_source : 36445f348b0909f9c9cecdc3a12f3a8ef187f6b7

security/manager/ssl/tests/mochitest/mixedcontent/test_bug383369.html

@@ -48,13 +48,31 @@
     var downloadManager = Components.classes["@mozilla.org/download-manager;1"]
       .getService(Components.interfaces.nsIDownloadManager);
     var theWindow = window;
-    window.setTimeout(function()
-    {
-      netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-      downloadManager.cleanUp();
-      theWindow.location = "bug383369step2.html";
-    }, 3000);
-  
+    var observer = {
+      observe: function(subject, topic, data) {
+        switch (topic) {
+        case "dl-done":
+        case "dl-failed":
+        case "dl-blocked":
+        case "dl-dirty":
+          netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+          downloadManager.cleanUp();
+          theWindow.location = "bug383369step2.html";
+          observerService.removeObserver(this, "dl-done");
+          observerService.removeObserver(this, "dl-failed");
+          observerService.removeObserver(this, "dl-blocked");
+          observerService.removeObserver(this, "dl-dirty");
+          break;
+        }
+      }
+    };
+    var observerService = Components.classes["@mozilla.org/observer-service;1"]
+      .getService(Components.interfaces.nsIObserverService);
+    observerService.addObserver(observer, "dl-done", false);
+    observerService.addObserver(observer, "dl-failed", false);
+    observerService.addObserver(observer, "dl-blocked", false);
+    observerService.addObserver(observer, "dl-dirty", false);
+
     window.location = "download.auto";
   }