1 files changed, 2 insertions, 17 deletions
diff --git a/toolkit/mozapps/extensions/test/xpcshell/test_locked.js b/toolkit/mozapps/extensions/test/xpcshell/test_locked.js
index 86457eab1..d16c1019d 100755..100644
--- a/toolkit/mozapps/extensions/test/xpcshell/test_locked.js
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_locked.js
@@ -361,12 +361,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, []);
@@ -445,11 +440,7 @@ add_task(function* run_test_1() {
 
    // After allowing access to the original DB things should go back to as
    // they were previously
-   try {
-     shutdownManager();
-   } catch (e) {
-     // We're expecting an error here.
-   }
+   shutdownManager();
    do_print("Unlocking " + gExtensionsJSON.path);
    yield file.close();
    gExtensionsJSON.permissions = filePermissions;
@@ -530,12 +521,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) {
-     // We're expecting an error here.
-   }
 });