From 78adda4c5badda5de0402bd70a4f60fcbda7c2cf Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Fri, 17 Feb 2023 09:01:44 +0000
Subject: [PATCH] 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        | 3 +--
 services/sync/tests/unit/head_helpers.js           | 1 -
 services/sync/tests/unit/head_http_server.js       | 1 -
 services/sync/tests/unit/test_sync_auth_manager.js | 3 +++
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/sync/modules-testing/utils.sys.mjs b/services/sync/modules-testing/utils.sys.mjs
index 9fd5101b9337..c2755a6833da 100644
--- a/services/sync/modules-testing/utils.sys.mjs
+++ b/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.
-export const { AccountState } = ChromeUtils.import(
+const { AccountState } = ChromeUtils.import(
   "resource://gre/modules/FxAccounts.jsm"
 );
 
diff --git a/services/sync/tests/unit/head_helpers.js b/services/sync/tests/unit/head_helpers.js
index f59ad6710256..7147fe7fab41 100644
--- a/services/sync/tests/unit/head_helpers.js
+++ b/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,
diff --git a/services/sync/tests/unit/head_http_server.js b/services/sync/tests/unit/head_http_server.js
index 38a7008dbc93..e93b4fe08bc3 100644
--- a/services/sync/tests/unit/head_http_server.js
+++ b/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,
diff --git a/services/sync/tests/unit/test_sync_auth_manager.js b/services/sync/tests/unit/test_sync_auth_manager.js
index 0864ceee1045..50adc8433e20 100644
--- a/services/sync/tests/unit/test_sync_auth_manager.js
+++ b/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;