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

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

1 files changed, 0 insertions, 61 deletions

diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js b/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js
deleted file mode 100644
index df717f5a5..000000000
--- a/toolkit/mozapps/extensions/test/xpcshell/test_provider_unsafe_access_shutdown.js
+++ /dev/null
@@ -1,61 +0,0 @@
-createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
-
-let shutdownOrder = [];
-
-function mockAddonProvider(name) {
-  let mockProvider = {
-    hasShutdown: false,
-    unsafeAccess: false,
-
-    shutdownCallback: null,
-
-    startup() { },
-    shutdown() {
-      this.hasShutdown = true;
-      shutdownOrder.push(this.name);
-      if (this.shutdownCallback)
-        return this.shutdownCallback();
-    },
-    getAddonByID(id, callback) {
-      if (this.hasShutdown) {
-        unsafeAccess = true;
-      }
-      callback(null);
-    },
-
-    get name() name,
-  };
-
-  return mockProvider;
-};
-
-function run_test() {
-  run_next_test();
-}
-
-add_task(function* unsafeProviderShutdown() {
-  let firstProvider = mockAddonProvider("Mock1");
-  AddonManagerPrivate.registerProvider(firstProvider);
-  let secondProvider = mockAddonProvider("Mock2");
-  AddonManagerPrivate.registerProvider(secondProvider);
-
-  startupManager();
-
-  let shutdownPromise = null;
-  yield new Promise(resolve => {
-    secondProvider.shutdownCallback = function() {
-      return new Promise(shutdownResolve => {
-        AddonManager.getAddonByID("does-not-exist", () => {
-          shutdownResolve();
-          resolve();
-        });
-      });
-    };
-
-    shutdownPromise = promiseShutdownManager();
-  });
-  yield shutdownPromise;
-
-  equal(shutdownOrder.join(","), ["Mock1", "Mock2"].join(","), "Mock providers should have shutdown in expected order");
-  ok(!firstProvider.unsafeAccess, "First registered mock provider should not have been accessed unsafely");
-});