diff -r 000000000000 -r 6474c204b198 browser/components/preferences/in-content/tests/browser_privacypane_4.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/components/preferences/in-content/tests/browser_privacypane_4.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,38 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+function test() {
+  let loader = Cc["@mozilla.org/moz/jssubscript-loader;1"].
+               getService(Ci.mozIJSSubScriptLoader);
+  let rootDir = getRootDirectory(gTestPath);
+  let jar = getJar(rootDir);
+  if (jar) {
+    let tmpdir = extractJarToTmp(jar);
+    rootDir = "file://" + tmpdir.path + '/';
+  }
+  loader.loadSubScript(rootDir + "privacypane_tests_perwindow.js", this);
+  let runtime = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime);
+
+  run_test_subset(Array.concat([
+    test_custom_retention("acceptCookies", "remember"),
+    test_custom_retention("acceptCookies", "custom")
+  ],
+    (runtime.isReleaseBuild ? [
+    test_custom_retention("acceptThirdPartyMenu", "remember", "visited"),
+    test_custom_retention("acceptThirdPartyMenu", "custom", "always")
+    ]
+    : [
+    test_custom_retention("acceptThirdPartyMenu", "remember", "always"),
+    test_custom_retention("acceptThirdPartyMenu", "custom", "visited")
+    ]), [
+    test_custom_retention("keepCookiesUntil", "remember", 1),
+    test_custom_retention("keepCookiesUntil", "custom", 2),
+    test_custom_retention("keepCookiesUntil", "custom", 0),
+    test_custom_retention("alwaysClear", "remember"),
+    test_custom_retention("alwaysClear", "custom"),
+    test_historymode_retention("remember", "remember"),
+
+    // reset all preferences to their default values once we're done
+    reset_preferences
+  ]));
+}