Bug 1038145 - Always properly cleanup the blocklist for browser_pluginnotifications.js. r=ttaubert
authorGeorg Fritzsche <georg.fritzsche@googlemail.com>
Wed, 15 Oct 2014 15:11:04 +0200
changeset 210440 d79f7f939ab47110d87fb013de4b479400bd49f8
parent 210439 31c202376ea813174fee0a425e691b730cc97b78
child 210441 579a8ed2fe3b43de0660c8a171f843290ea01876
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersttaubert
bugs1038145
milestone36.0a1
Bug 1038145 - Always properly cleanup the blocklist for browser_pluginnotifications.js. r=ttaubert
browser/base/content/test/plugins/browser_pluginnotification.js
--- a/browser/base/content/test/plugins/browser_pluginnotification.js
+++ b/browser/base/content/test/plugins/browser_pluginnotification.js
@@ -56,16 +56,19 @@ TabOpenListener.prototype = {
 
 function test() {
   waitForExplicitFinish();
   SimpleTest.requestCompleteLog();
   requestLongerTimeout(2);
   registerCleanupFunction(function() {
     clearAllPluginPermissions();
     Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
+    return new Promise(resolve => {
+      setAndUpdateBlocklist(gHttpTestRoot + "blockNoPlugins.xml", resolve);
+    });
   });
   Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
 
   setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY);
   setTestPluginEnabledState(Ci.nsIPluginTag.STATE_CLICKTOPLAY, "Second Test Plug-in");
 
   var newTab = gBrowser.addTab();
   gBrowser.selectedTab = newTab;