diff -r 000000000000 -r 6474c204b198 browser/base/content/test/social/browser_social_perwindowPB.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/base/content/test/social/browser_social_perwindowPB.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,100 @@
+/* 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/. */
+
+function openTab(win, url, callback) {
+  let newTab = win.gBrowser.addTab(url);
+  let tabBrowser = win.gBrowser.getBrowserForTab(newTab);
+  tabBrowser.addEventListener("load", function tabLoadListener() {
+    tabBrowser.removeEventListener("load", tabLoadListener, true);
+    win.gBrowser.selectedTab = newTab;
+    callback(newTab);
+  }, true)
+}
+
+// Tests for per-window private browsing.
+function openPBWindow(callback) {
+  let w = OpenBrowserWindow({private: true});
+  w.addEventListener("load", function loadListener() {
+    w.removeEventListener("load", loadListener);
+    openTab(w, "http://example.com", function() {
+      callback(w);
+    });
+  });
+}
+
+function postAndReceive(port, postTopic, receiveTopic, callback) {
+  port.onmessage = function(e) {
+    if (e.data.topic == receiveTopic)
+      callback();
+  }
+  port.postMessage({topic: postTopic});
+}
+
+function test() {
+  waitForExplicitFinish();
+
+  let manifest = { // normal provider
+    name: "provider 1",
+    origin: "https://example.com",
+    sidebarURL: "https://example.com/browser/browser/base/content/test/social/social_sidebar.html",
+    statusURL: "https://example.com/browser/browser/base/content/test/social/social_panel.html",
+    workerURL: "https://example.com/browser/browser/base/content/test/social/social_worker.js",
+    markURL: "https://example.com/browser/browser/base/content/test/social/social_mark.html?url=%{url}",
+    iconURL: "https://example.com/browser/browser/base/content/test/general/moz.png"
+  };
+  runSocialTestWithProvider(manifest, function (finishcb) {
+    openTab(window, "http://example.com", function(newTab) {
+      runSocialTests(tests, undefined, undefined, function() {
+        window.gBrowser.removeTab(newTab);
+        finishcb();
+      });
+    });
+  });
+}
+
+var tests = {
+  testPrivateBrowsing: function(next) {
+    let port = SocialSidebar.provider.getWorkerPort();
+    ok(port, "provider has a port");
+    postAndReceive(port, "test-init", "test-init-done", function() {
+      // social features should all be enabled in the existing window.
+      info("checking main window ui");
+      ok(window.SocialUI.enabled, "social is enabled in normal window");
+      checkSocialUI(window);
+      // open a new private-window
+      openPBWindow(function(pbwin) {
+        // The provider should remain alive.
+        postAndReceive(port, "ping", "pong", function() {
+          // the new window should have no social features at all.
+          info("checking private window ui");
+          ok(!pbwin.SocialUI.enabled, "social is disabled in a PB window");
+          checkSocialUI(pbwin);
+
+          // but they should all remain enabled in the initial window
+          info("checking main window ui");
+          ok(window.SocialUI.enabled, "social is still enabled in normal window");
+          checkSocialUI(window);
+
+          // Check that the status button is disabled on the private
+          // browsing window and not on the normal window.
+          let id = SocialStatus._toolbarHelper.idFromOrigin("https://example.com");
+          let widget = CustomizableUI.getWidget(id);
+          ok(widget.forWindow(pbwin).node.disabled, "status button disabled on private window");
+          ok(!widget.forWindow(window).node.disabled, "status button enabled on normal window");
+
+          // Check that the mark button is disabled on the private
+          // browsing window and not on the normal window.
+          id = SocialMarks._toolbarHelper.idFromOrigin("https://example.com");
+          widget = CustomizableUI.getWidget(id);
+          ok(widget.forWindow(pbwin).node.disabled, "mark button disabled on private window");
+          ok(!widget.forWindow(window).node.disabled, "mark button enabled on normal window");
+
+          // that's all folks...
+          pbwin.close();
+          next();
+        })
+      });
+    });
+  },
+}