Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 0 insertions, 29 deletions

diff --git a/toolkit/mozapps/extensions/test/browser/browser_bug679604.js b/toolkit/mozapps/extensions/test/browser/browser_bug679604.js
deleted file mode 100644
index e1ec605c2..000000000
--- a/toolkit/mozapps/extensions/test/browser/browser_bug679604.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-// Bug 679604 - Test that a XUL persisted category from an older version of
-// Firefox doesn't break the add-ons manager when that category doesn't exist
-
-var gManagerWindow;
-
-function test() {
-  waitForExplicitFinish();
-
-  open_manager(null, function(aWindow) {
-    var categories = aWindow.document.getElementById("categories");
-    categories.setAttribute("last-selected", "foo");
-    aWindow.document.persist("categories", "last-selected");
-
-    close_manager(aWindow, function() {
-      Services.prefs.clearUserPref(PREF_UI_LASTCATEGORY);
-
-      open_manager(null, function(aWindow) {
-        is(new CategoryUtilities(aWindow).selectedCategory, "discover",
-           "Should have loaded the right view");
-
-        close_manager(aWindow, finish);
-      });
-    });
-  });
-}