1 files changed, 3 insertions, 19 deletions
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locked_strictcompat.js b/toolkit/mozapps/extensions/test/xpcshell/test_locked_strictcompat.js
index 9e17b4c8b..907c611dd 100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_locked_strictcompat.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_locked_strictcompat.js
@@ -362,12 +362,7 @@ add_task(function* run_test_1() {
   // Restarting will actually apply changes to extensions.ini which will
   // then be put into the in-memory database when we next fail to load the
   // real thing
-  try {
-    shutdownManager();
-  } catch (e) {
-    // We're expecting an error here.
-  }
-  startupManager(false);
+  restartManager();
 
   // Shouldn't have seen any startup changes
   check_startup_changes(AddonManager.STARTUP_CHANGE_INSTALLED, []);
@@ -446,12 +441,7 @@ add_task(function* run_test_1() {
 
   // After allowing access to the original DB things should go back to as
   // back how they were before the lock
-  let shutdownError;
-  try {
-    shutdownManager();
-  } catch (e) {
-    shutdownError = e;
-  }
+  shutdownManager();
   do_print("Unlocking " + gExtensionsJSON.path);
   yield file.close();
   gExtensionsJSON.permissions = filePermissions;
@@ -491,7 +481,7 @@ add_task(function* run_test_1() {
   // remember that this extension was changed to disabled. On Windows we
   // couldn't replace the old DB so we read the older version of the DB
   // where the extension is enabled
-  if (shutdownError) {
+  if (gXPISaveError) {
     do_print("XPI save failed");
     do_check_true(a3.isActive);
     do_check_false(a3.appDisabled);
@@ -553,12 +543,6 @@ add_task(function* run_test_1() {
   do_check_false(t2.appDisabled);
   do_check_eq(t2.pendingOperations, AddonManager.PENDING_NONE);
   do_check_true(isThemeInAddonsList(profileDir, t2.id));
-
-  try {
-    shutdownManager();
-  } catch (e) {
-    // An error is expected here.
-  }
 });
 
 function run_test() {