Bug 1817182 - Avoid re-exporting AccountState from sync's utils.sys.mjs. r=markh

Differential Revision: https://phabricator.services.mozilla.com/D170060

services/sync/modules-testing/utils.sys.mjs

@@ -27,8 +27,7 @@ const { SCOPE_OLD_SYNC, LEGACY_SCOPE_WEBEXT_SYNC } = ChromeUtils.import(
   "resource://gre/modules/FxAccountsCommon.js"
 );
 
-// and grab non-exported stuff via a backstage pass.
+const { AccountState } = ChromeUtils.import(
-export const { AccountState } = ChromeUtils.import(
   "resource://gre/modules/FxAccounts.jsm"
 );
 

services/sync/tests/unit/head_helpers.js

@@ -38,7 +38,6 @@ var { ObjectUtils } = ChromeUtils.import(
   "resource://gre/modules/ObjectUtils.jsm"
 );
 var {
-  AccountState,
   MockFxaStorageManager,
   SyncTestingInfrastructure,
   configureFxAccountIdentity,

services/sync/tests/unit/head_http_server.js

@@ -11,7 +11,6 @@ var { TestUtils } = ChromeUtils.importESModule(
   "resource://testing-common/TestUtils.sys.mjs"
 );
 var {
-  AccountState,
   MockFxaStorageManager,
   SyncTestingInfrastructure,
   configureFxAccountIdentity,

services/sync/tests/unit/test_sync_auth_manager.js

@@ -35,6 +35,9 @@ const { Status } = ChromeUtils.importESModule(
 const { TokenServerClient, TokenServerClientServerError } = ChromeUtils.import(
   "resource://services-common/tokenserverclient.js"
 );
+const { AccountState } = ChromeUtils.import(
+  "resource://gre/modules/FxAccounts.jsm"
+);
 
 const SECOND_MS = 1000;
 const MINUTE_MS = SECOND_MS * 60;