Backed out changeset 2673f348598c (bug 850721) for mochitest-bc timeouts. a=backout
authorRyan VanderMeulen <ryanvm@gmail.com>
Sun, 09 Feb 2014 19:22:04 -0500
changeset 157035 ac67e86343b0d8b7ce6b7995c667f66b7be21ef5
parent 157034 2673f348598cacb9b577c0be061dff246d0bcf5f
child 157036 fa4a37069103163c5b087d85b947ba1696c9a9bd
push id447
push userryanvm@gmail.com
push dateMon, 10 Feb 2014 00:22:06 +0000
reviewersbackout
bugs850721
milestone26.0
backs out2673f348598cacb9b577c0be061dff246d0bcf5f
Backed out changeset 2673f348598c (bug 850721) for mochitest-bc timeouts. a=backout DONTBUILD
browser/base/content/test/social/head.js
--- a/browser/base/content/test/social/head.js
+++ b/browser/base/content/test/social/head.js
@@ -306,34 +306,24 @@ function updateBlocklist(aCallback) {
     Services.obs.removeObserver(observer, "blocklist-updated");
     if (aCallback)
       executeSoon(aCallback);
   };
   Services.obs.addObserver(observer, "blocklist-updated", false);
   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) {
   let string = Cc["@mozilla.org/supports-string;1"].
                createInstance(Ci.nsISupportsString);
   string.data = JSON.stringify(manifest);
   Services.prefs.setComplexValue(name, Ci.nsISupportsString, string);
 }