diff -r 000000000000 -r 6474c204b198 browser/base/content/test/social/browser_blocklist.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/base/content/test/social/browser_blocklist.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,187 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+// a place for miscellaneous social tests
+
+let SocialService = Cu.import("resource://gre/modules/SocialService.jsm", {}).SocialService;
+
+const URI_EXTENSION_BLOCKLIST_DIALOG = "chrome://mozapps/content/extensions/blocklist.xul";
+let blocklistURL = "http://example.com/browser/browser/base/content/test/social/blocklist.xml";
+
+let manifest = { // normal provider
+  name: "provider ok",
+  origin: "https://example.com",
+  sidebarURL: "https://example.com/browser/browser/base/content/test/social/social_sidebar.html",
+  workerURL: "https://example.com/browser/browser/base/content/test/social/social_worker.js",
+  iconURL: "https://example.com/browser/browser/base/content/test/general/moz.png"
+};
+let manifest_bad = { // normal provider
+  name: "provider blocked",
+  origin: "https://test1.example.com",
+  sidebarURL: "https://test1.example.com/browser/browser/base/content/test/social/social_sidebar.html",
+  workerURL: "https://test1.example.com/browser/browser/base/content/test/social/social_worker.js",
+  iconURL: "https://test1.example.com/browser/browser/base/content/test/general/moz.png"
+};
+
+function test() {
+  waitForExplicitFinish();
+  // turn on logging for nsBlocklistService.js
+  Services.prefs.setBoolPref("extensions.logging.enabled", true);
+  registerCleanupFunction(function () {
+    Services.prefs.clearUserPref("extensions.logging.enabled");
+  });
+
+  runSocialTests(tests, undefined, undefined, function () {
+    resetBlocklist(finish); //restore to original pref
+  });
+}
+
+var tests = {
+  testSimpleBlocklist: function(next) {
+    // this really just tests adding and clearing our blocklist for later tests
+    setAndUpdateBlocklist(blocklistURL, function() {
+      ok(Services.blocklist.isAddonBlocklisted(SocialService.createWrapper(manifest_bad)), "blocking 'blocked'");
+      ok(!Services.blocklist.isAddonBlocklisted(SocialService.createWrapper(manifest)), "not blocking 'good'");
+      resetBlocklist(function() {
+        ok(!Services.blocklist.isAddonBlocklisted(SocialService.createWrapper(manifest_bad)), "blocklist cleared");
+        next();
+      });
+    });
+  },
+  testAddingNonBlockedProvider: function(next) {
+    function finishTest(isgood) {
+      ok(isgood, "adding non-blocked provider ok");
+      Services.prefs.clearUserPref("social.manifest.good");
+      resetBlocklist(next);
+    }
+    setManifestPref("social.manifest.good", manifest);
+    setAndUpdateBlocklist(blocklistURL, function() {
+      try {
+        SocialService.addProvider(manifest, function(provider) {
+          try {
+            SocialService.removeProvider(provider.origin, function() {
+              ok(true, "added and removed provider");
+              finishTest(true);
+            });
+          } catch(e) {
+            ok(false, "SocialService.removeProvider threw exception: " + e);
+            finishTest(false);
+          }
+        });
+      } catch(e) {
+        ok(false, "SocialService.addProvider threw exception: " + e);
+        finishTest(false);
+      }
+    });
+  },
+  testAddingBlockedProvider: function(next) {
+    function finishTest(good) {
+      ok(good, "Unable to add blocklisted provider");
+      Services.prefs.clearUserPref("social.manifest.blocked");
+      resetBlocklist(next);
+    }
+    setManifestPref("social.manifest.blocked", manifest_bad);
+    setAndUpdateBlocklist(blocklistURL, function() {
+      try {
+        SocialService.addProvider(manifest_bad, function(provider) {
+          SocialService.removeProvider(provider.origin, function() {
+            ok(false, "SocialService.addProvider should throw blocklist exception");
+            finishTest(false);
+          });
+        });
+      } catch(e) {
+        ok(true, "SocialService.addProvider should throw blocklist exception: " + e);
+        finishTest(true);
+      }
+    });
+  },
+  testInstallingBlockedProvider: function(next) {
+    function finishTest(good) {
+      ok(good, "Unable to add blocklisted provider");
+      Services.prefs.clearUserPref("social.whitelist");
+      resetBlocklist(next);
+    }
+    let activationURL = manifest_bad.origin + "/browser/browser/base/content/test/social/social_activate.html"
+    addTab(activationURL, function(tab) {
+      let doc = tab.linkedBrowser.contentDocument;
+      let installFrom = doc.nodePrincipal.origin;
+      // whitelist to avoid the 3rd party install dialog, we only want to test
+      // the blocklist inside installProvider.
+      Services.prefs.setCharPref("social.whitelist", installFrom);
+      setAndUpdateBlocklist(blocklistURL, function() {
+        try {
+          // expecting an exception when attempting to install a hard blocked
+          // provider
+          Social.installProvider(doc, manifest_bad, function(addonManifest) {
+            gBrowser.removeTab(tab);
+            finishTest(false);
+          });
+        } catch(e) {
+          gBrowser.removeTab(tab);
+          finishTest(true);
+        }
+      });
+    });
+  },
+  testBlockingExistingProvider: function(next) {
+    let listener = {
+      _window: null,
+      onOpenWindow: function(aXULWindow) {
+        Services.wm.removeListener(this);
+        this._window = aXULWindow;
+        let domwindow = aXULWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                                  .getInterface(Ci.nsIDOMWindow);
+
+        domwindow.addEventListener("load", function _load() {
+          domwindow.removeEventListener("load", _load, false);
+
+          domwindow.addEventListener("unload", function _unload() {
+            domwindow.removeEventListener("unload", _unload, false);
+            info("blocklist window was closed");
+            Services.wm.removeListener(listener);
+            next();
+          }, false);
+
+          is(domwindow.document.location.href, URI_EXTENSION_BLOCKLIST_DIALOG, "dialog opened and focused");
+          // wait until after load to cancel so the dialog has initalized. we
+          // don't want to accept here since that restarts the browser.
+          executeSoon(() => {
+            let cancelButton = domwindow.document.documentElement.getButton("cancel");
+            info("***** hit the cancel button\n");
+            cancelButton.doCommand();
+          });
+        }, false);
+      },
+      onCloseWindow: function(aXULWindow) { },
+      onWindowTitleChange: function(aXULWindow, aNewTitle) { }
+    };
+
+    Services.wm.addListener(listener);
+
+    setManifestPref("social.manifest.blocked", manifest_bad);
+    try {
+      SocialService.addProvider(manifest_bad, function(provider) {
+        // the act of blocking should cause a 'provider-disabled' notification
+        // from SocialService.
+        SocialService.registerProviderListener(function providerListener(topic, origin, providers) {
+          if (topic != "provider-disabled")
+            return;
+          SocialService.unregisterProviderListener(providerListener);
+          is(origin, provider.origin, "provider disabled");
+          SocialService.getProvider(provider.origin, function(p) {
+            ok(p == null, "blocklisted provider disabled");
+            Services.prefs.clearUserPref("social.manifest.blocked");
+            resetBlocklist();
+          });
+        });
+        // no callback - the act of updating should cause the listener above
+        // to fire.
+        setAndUpdateBlocklist(blocklistURL);
+      });
+    } catch(e) {
+      ok(false, "unable to add provider " + e);
+      next();
+    }
+  }
+}