commit 56be3872ccf1e66f0bc77ab21c343ede3ea8bf59
Author: Ryan VanderMeulen <[email protected]>
Date: Sun Feb 9 19:22:58 2014 -0500
Backed out changeset 1f9a3ddde18f (bug 850721) for mochitest-bc timeouts.
a=backout
DONTBUILD
---
browser/base/content/test/social/head.js | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/browser/base/content/test/social/head.js
b/browser/base/content/test/social/head.js
index 5b77729..1e5d841 100644
--- a/browser/base/content/test/social/head.js
+++ b/browser/base/content/test/social/head.js
@@ -252,24 +252,14 @@ function updateBlocklist(aCallback) {
blocklistNotifier.notify(null);
}
-var _originalTestBlocklistURL = null;
function setAndUpdateBlocklist(aURL, aCallback) {
- if (!_originalTestBlocklistURL)
- _originalTestBlocklistURL =
Services.prefs.getCharPref("extensions.blocklist.url");
Services.prefs.setCharPref("extensions.blocklist.url", aURL);
updateBlocklist(aCallback);
}
function resetBlocklist(aCallback) {
- // XXX - this has "forked" from the head.js helpers in our parent directory
:(
- // But let's reuse their blockNoPlugins.xml. Later, we should arrange to
- // use their head.js helpers directly
- let noBlockedURL =
"http://example.com/browser/browser/base/content/test/general/blockNoPlugins.xml";;
- setAndUpdateBlocklist(noBlockedURL, function() {
- Services.prefs.setCharPref("extensions.blocklist.url",
_originalTestBlocklistURL);
- if (aCallback)
- aCallback();
- });
+ Services.prefs.clearUserPref("extensions.blocklist.url");
+ updateBlocklist(aCallback);
}
function setManifestPref(name, manifest) {
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
