Attachment 367041 Details for Bug 442099

[patch] Patch v2.0

patch_v2.0 (text/plain), 2.90 KB, created by Michael Kohler [:mkohler]

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Kohler [:mkohler]

Size: 2.90 KB

patch

obsolete

>diff --git a/toolkit/components/downloads/test/browser/browser_bug414214.js b/toolkit/components/downloads/test/browser/browser_bug414214.js
>--- a/toolkit/components/downloads/test/browser/browser_bug414214.js
>+++ b/toolkit/components/downloads/test/browser/browser_bug414214.js
>@@ -77,17 +77,17 @@ function test()
>   // The window doesn't open once we call show, so we need to wait a little bit
>   function finishUp() {
>     var dmui = Cc["@mozilla.org/download-manager-ui;1"].
>                getService(Ci.nsIDownloadManagerUI);
>     ok(dmui.visible, "Download Manager window is open, as expected.");
> 
>     // Reset the pref to its default value
>     Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch).
>-    setBoolPref(PREF_BDM_CLOSEWHENDONE, false);
>+    clearUserPref(PREF_BDM_CLOSEWHENDONE);
> 
>     finish();
>   }
>   
>   // OK, let's pull up the UI
>   // Linux uses y, everything else is j
>   var key = navigator.platform.match("Linux") ? "y" : "j";
>   EventUtils.synthesizeKey(key, {metaKey: true}, window.opener);
>diff --git a/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul b/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul
>--- a/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul
>+++ b/toolkit/mozapps/downloads/tests/chrome/test_retention_is_0_closes.xul
>@@ -190,16 +190,23 @@ function test()
>   // Start the test when the download manager window loads
>   let ww = Cc["@mozilla.org/embedcomp/window-watcher;1"].
>            getService(Ci.nsIWindowWatcher);
>   ww.registerNotification(obs);
> 
>   addDownload();
> 
>   SimpleTest.waitForExplicitFinish();
>+
>+  let prefs = Cc["@mozilla.org/preferences-service;1"].
>+              getService(Ci.nsIPrefService);
>+  prefs.clearUserPref("browser.download.manager.retention");
>+  prefs.clearUserPref("browser.download.manager.closeWhenDone");
>+
>+  SimpleTest.finish();
> }
> 
>   ]]>
>   </script>
> 
>   <body xmlns="http://www.w3.org/1999/xhtml">
>     <p id="display"></p>
>     <div id="content" style="display:none;"></div>
>diff --git a/toolkit/mozapps/downloads/tests/chrome/test_ui_stays_open_on_alert_clickback.xul b/toolkit/mozapps/downloads/tests/chrome/test_ui_stays_open_on_alert_clickback.xul
>--- a/toolkit/mozapps/downloads/tests/chrome/test_ui_stays_open_on_alert_clickback.xul
>+++ b/toolkit/mozapps/downloads/tests/chrome/test_ui_stays_open_on_alert_clickback.xul
>@@ -105,16 +105,19 @@ function test()
> 
>   // Register with the observer service
>   os.addObserver(testObs, DLMGR_UI_DONE, false);
> 
>   // Simulate an alert click with pref set to true
>   setClose(true);
>   dm.QueryInterface(Ci.nsIObserver).observe(null, "alertclickcallback", null);
> 
>+  Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch).
>+    clearUserPref("browser.download.manager.closeWhenDone");
>+
>   SimpleTest.waitForExplicitFinish();
> }
> 
>   ]]>
>   </script>
> 
>   <body xmlns="http://www.w3.org/1999/xhtml">
>     <p id="display"></p>

Flags:

sdwilsh: review+

Actions: View | Diff | Review

Attachments on bug 442099: 366674 | 367041 | 367842 | 368296 | 368323 | 368360 | 368788 | 368789 | 369147