From 509ec9e77d2c9237a9dfb8f110d5406cdd998d02 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 17 Aug 2018 11:08:38 -0400
Subject: [PATCH] Bug 1483378 - Part 2: Remove some obsolete privacy pane
 tests; r=johannh

---
 .../preferences/in-content/tests/browser.ini  |  2 --
 .../in-content/tests/browser_privacypane_3.js |  2 ++
 .../in-content/tests/browser_privacypane_4.js | 24 ------------------
 .../in-content/tests/browser_privacypane_8.js | 25 -------------------
 4 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 browser/components/preferences/in-content/tests/browser_privacypane_4.js
 delete mode 100644 browser/components/preferences/in-content/tests/browser_privacypane_8.js

diff --git a/browser/components/preferences/in-content/tests/browser.ini b/browser/components/preferences/in-content/tests/browser.ini
index 4c8fe187273f..ac34e72ff3e8 100644
--- a/browser/components/preferences/in-content/tests/browser.ini
+++ b/browser/components/preferences/in-content/tests/browser.ini
@@ -70,9 +70,7 @@ run-if = nightly_build
 # added.
 [browser_privacypane_1.js]
 [browser_privacypane_3.js]
-[browser_privacypane_4.js]
 [browser_privacypane_5.js]
-[browser_privacypane_8.js]
 [browser_sanitizeOnShutdown_prefLocked.js]
 [browser_searchShowSuggestionsFirst.js]
 [browser_searchsuggestions.js]
diff --git a/browser/components/preferences/in-content/tests/browser_privacypane_3.js b/browser/components/preferences/in-content/tests/browser_privacypane_3.js
index 996641e31ddd..87e478539845 100644
--- a/browser/components/preferences/in-content/tests/browser_privacypane_3.js
+++ b/browser/components/preferences/in-content/tests/browser_privacypane_3.js
@@ -13,4 +13,6 @@ run_test_subset([
   test_custom_retention("rememberForms", "custom"),
   test_custom_retention("rememberForms", "custom"),
   test_historymode_retention("remember", "custom"),
+  test_custom_retention("alwaysClear", "remember"),
+  test_custom_retention("alwaysClear", "custom"),
 ]);
diff --git a/browser/components/preferences/in-content/tests/browser_privacypane_4.js b/browser/components/preferences/in-content/tests/browser_privacypane_4.js
deleted file mode 100644
index 08bfa7625124..000000000000
--- a/browser/components/preferences/in-content/tests/browser_privacypane_4.js
+++ /dev/null
@@ -1,24 +0,0 @@
-requestLongerTimeout(2);
-
-let rootDir = getRootDirectory(gTestPath);
-let jar = getJar(rootDir);
-if (jar) {
-  let tmpdir = extractJarToTmp(jar);
-  rootDir = "file://" + tmpdir.path + "/";
-}
-/* import-globals-from privacypane_tests_perwindow.js */
-Services.scriptloader.loadSubScript(rootDir + "privacypane_tests_perwindow.js", this);
-let runtime = Services.appInfo;
-
-run_test_subset([
-  test_custom_retention("acceptCookies", "remember"),
-  test_custom_retention("acceptCookies", "custom"),
-  test_custom_retention("acceptThirdPartyMenu", "custom", "visited"),
-  test_custom_retention("acceptThirdPartyMenu", "custom", "always"),
-  test_custom_retention("keepCookiesUntil", "custom", 1),
-  test_custom_retention("keepCookiesUntil", "custom", 2),
-  test_custom_retention("keepCookiesUntil", "custom", 0),
-  test_custom_retention("alwaysClear", "custom"),
-  test_custom_retention("alwaysClear", "custom"),
-  test_historymode_retention("remember", "custom"),
-]);
diff --git a/browser/components/preferences/in-content/tests/browser_privacypane_8.js b/browser/components/preferences/in-content/tests/browser_privacypane_8.js
deleted file mode 100644
index 97a12dea6728..000000000000
--- a/browser/components/preferences/in-content/tests/browser_privacypane_8.js
+++ /dev/null
@@ -1,25 +0,0 @@
-let rootDir = getRootDirectory(gTestPath);
-let jar = getJar(rootDir);
-if (jar) {
-  let tmpdir = extractJarToTmp(jar);
-  rootDir = "file://" + tmpdir.path + "/";
-}
-/* import-globals-from privacypane_tests_perwindow.js */
-Services.scriptloader.loadSubScript(rootDir + "privacypane_tests_perwindow.js", this);
-
-run_test_subset([
-  // history mode should be initialized to remember
-  test_historymode_retention("remember", undefined),
-
-  // history mode should remain remember; toggle acceptCookies checkbox
-  test_custom_retention("acceptCookies", "remember"),
-
-  // history mode should now be custom; set history mode to dontremember
-  test_historymode_retention("dontremember", "custom"),
-
-  // history mode should remain custom; set history mode to remember
-  test_historymode_retention("remember", "custom"),
-
-  // history mode should now be remember
-  test_historymode_retention("remember", "remember"),
-]);