Bug 1194529 - Move OSKeyStore.jsm to browser/modules since it is no longer used by just Form Autofill. r=MattN

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

--HG--
rename : browser/extensions/formautofill/OSKeyStore.jsm => browser/modules/OSKeyStore.jsm
rename : browser/extensions/formautofill/test/fixtures/OSKeyStoreTestUtils.jsm => browser/modules/test/OSKeyStoreTestUtils.jsm
rename : browser/extensions/formautofill/test/unit/test_osKeyStore.js => browser/modules/test/unit/test_osKeyStore.js
extra : moz-landing-system : lando

browser/components/payments/content/paymentDialogWrapper.js

@@ -40,7 +40,7 @@ ChromeUtils.defineModuleGetter(
 ChromeUtils.defineModuleGetter(
   this,
   "OSKeyStore",
-  "resource://formautofill/OSKeyStore.jsm"
+  "resource:///modules/OSKeyStore.jsm"
 );
 ChromeUtils.defineModuleGetter(
   this,

browser/extensions/formautofill/FormAutofillParent.jsm

@@ -47,7 +47,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
     "resource://formautofill/FormAutofillPreferences.jsm",
   FormAutofillDoorhanger: "resource://formautofill/FormAutofillDoorhanger.jsm",
   FormAutofillUtils: "resource://formautofill/FormAutofillUtils.jsm",
-  OSKeyStore: "resource://formautofill/OSKeyStore.jsm",
+  OSKeyStore: "resource:///modules/OSKeyStore.jsm",
 });
 
 this.log = null;

browser/extensions/formautofill/FormAutofillStorage.jsm

@@ -161,7 +161,7 @@ ChromeUtils.defineModuleGetter(
 ChromeUtils.defineModuleGetter(
   this,
   "OSKeyStore",
-  "resource://formautofill/OSKeyStore.jsm"
+  "resource:///modules/OSKeyStore.jsm"
 );
 ChromeUtils.defineModuleGetter(
   this,

browser/extensions/formautofill/content/manageDialog.js

@@ -39,7 +39,7 @@ ChromeUtils.defineModuleGetter(
 ChromeUtils.defineModuleGetter(
   this,
   "OSKeyStore",
-  "resource://formautofill/OSKeyStore.jsm"
+  "resource:///modules/OSKeyStore.jsm"
 );
 
 XPCOMUtils.defineLazyGetter(this, "reauthPasswordPromptMessage", () => {

browser/extensions/formautofill/moz.build

@@ -32,8 +32,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         'skin/windows/editDialog.css',
     ]
 
-TESTING_JS_MODULES += ['test/fixtures/OSKeyStoreTestUtils.jsm']
-
 BROWSER_CHROME_MANIFESTS += [
     'test/browser/browser.ini',
     'test/browser/creditCard/browser.ini',

browser/extensions/formautofill/test/browser/head.js

@@ -6,14 +6,14 @@
             SUPPORTED_COUNTRIES_PREF,
             SYNC_USERNAME_PREF, SYNC_ADDRESSES_PREF, SYNC_CREDITCARDS_PREF, SYNC_CREDITCARDS_AVAILABLE_PREF, CREDITCARDS_USED_STATUS_PREF,
             DEFAULT_REGION_PREF,
-            sleep, expectPopupOpen, openPopupOn, openPopupForSubframe, expectPopupClose, closePopup, closePopupForSubframe, 
+            sleep, expectPopupOpen, openPopupOn, openPopupForSubframe, expectPopupClose, closePopup, closePopupForSubframe,
             clickDoorhangerButton, getAddresses, saveAddress, removeAddresses, saveCreditCard,
             getDisplayedPopupItems, getDoorhangerCheckbox,
             getNotification, getDoorhangerButton, removeAllRecords, expectWarningText, testDialog */
 
 "use strict";
 
-ChromeUtils.import("resource://formautofill/OSKeyStore.jsm", this);
+ChromeUtils.import("resource:///modules/OSKeyStore.jsm", this);
 ChromeUtils.import("resource://testing-common/OSKeyStoreTestUtils.jsm", this);
 
 const MANAGE_ADDRESSES_DIALOG_URL =

browser/extensions/formautofill/test/unit/test_autofillFormFields.js

@@ -15,9 +15,7 @@ add_task(async function setup() {
   ({ FormAutofillHandler } = ChromeUtils.import(
     "resource://formautofill/FormAutofillHandler.jsm"
   ));
-  ({ OSKeyStore } = ChromeUtils.import(
-    "resource://formautofill/OSKeyStore.jsm"
-  ));
+  ({ OSKeyStore } = ChromeUtils.import("resource:///modules/OSKeyStore.jsm"));
 });
 
 const TESTCASES = [

browser/extensions/formautofill/test/unit/test_getRecords.js

@@ -14,9 +14,7 @@ add_task(async function setup() {
   ({ FormAutofillParent, FormAutofillStatus } = ChromeUtils.import(
     "resource://formautofill/FormAutofillParent.jsm"
   ));
-  ({ OSKeyStore } = ChromeUtils.import(
-    "resource://formautofill/OSKeyStore.jsm"
-  ));
+  ({ OSKeyStore } = ChromeUtils.import("resource:///modules/OSKeyStore.jsm"));
 });
 
 const TEST_ADDRESS_1 = {

browser/extensions/formautofill/test/unit/test_migrateRecords.js

@@ -13,9 +13,7 @@ add_task(async function setup() {
     "resource://formautofill/FormAutofillStorage.jsm",
     null
   ));
-  ({ OSKeyStore } = ChromeUtils.import(
-    "resource://formautofill/OSKeyStore.jsm"
-  ));
+  ({ OSKeyStore } = ChromeUtils.import("resource:///modules/OSKeyStore.jsm"));
 });
 
 const TEST_STORE_FILE_NAME = "test-profile.json";

browser/extensions/formautofill/test/unit/xpcshell.ini

@@ -44,7 +44,6 @@ skip-if = tsan # Times out, bug 1612707
 skip-if = tsan # Times out, bug 1612707
 [test_nameUtils.js]
 [test_onFormSubmitted.js]
-[test_osKeyStore.js]
 skip-if = tsan # Times out, bug 1612707
 [test_parseAddressFormat.js]
 [test_profileAutocompleteResult.js]

browser/modules/moz.build

@@ -121,6 +121,7 @@ with Files("webrtcUI.jsm"):
 with Files("ZoomUI.jsm"):
     BUG_COMPONENT = ("Firefox", "Toolbars and Customization")
 
+TESTING_JS_MODULES += ['test/OSKeyStoreTestUtils.jsm']
 
 BROWSER_CHROME_MANIFESTS += [
     'test/browser/browser.ini',
@@ -146,6 +147,7 @@ EXTRA_JS_MODULES += [
     'LiveBookmarkMigrator.jsm',
     'NewTabPagePreloading.jsm',
     'OpenInTabsUtils.jsm',
+    'OSKeyStore.jsm',
     'PageActions.jsm',
     'PermissionUI.jsm',
     'PingCentre.jsm',

browser/modules/test/OSKeyStoreTestUtils.jsm

@@ -5,7 +5,7 @@
 
 var EXPORTED_SYMBOLS = ["OSKeyStoreTestUtils"];
 
-ChromeUtils.import("resource://formautofill/OSKeyStore.jsm", this);
+ChromeUtils.import("resource:///modules/OSKeyStore.jsm", this);
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );

browser/modules/test/unit/test_osKeyStore.js

@@ -4,13 +4,27 @@
 
 "use strict";
 
+var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
+var { TestUtils } = ChromeUtils.import(
+  "resource://testing-common/TestUtils.jsm"
+);
+
+let OSKeyStoreTestUtils;
+add_task(async function os_key_store_setup() {
+  ({ OSKeyStoreTestUtils } = ChromeUtils.import(
+    "resource://testing-common/OSKeyStoreTestUtils.jsm"
+  ));
+  OSKeyStoreTestUtils.setup();
+  registerCleanupFunction(async function cleanup() {
+    await OSKeyStoreTestUtils.cleanup();
+  });
+});
+
 let OSKeyStore;
 add_task(async function setup() {
   Services.prefs.setBoolPref("extensions.formautofill.reauth.enabled", true);
 
-  ({ OSKeyStore } = ChromeUtils.import(
-    "resource://formautofill/OSKeyStore.jsm"
-  ));
+  ({ OSKeyStore } = ChromeUtils.import("resource:///modules/OSKeyStore.jsm"));
 });
 
 // Ensure that the appropriate initialization has happened.

browser/modules/test/unit/xpcshell.ini

@@ -7,6 +7,7 @@ skip-if = toolkit == 'android'
 [test_HomePage.js]
 [test_HomePage_ignore.js]
 [test_LiveBookmarkMigrator.js]
+[test_osKeyStore.js]
 [test_Sanitizer_interrupted.js]
 [test_SitePermissions.js]
 [test_SiteDataManager.js]

services/sync/tps/extensions/tps/resource/modules/formautofill.jsm

@@ -25,7 +25,7 @@ ChromeUtils.defineModuleGetter(
 ChromeUtils.defineModuleGetter(
   this,
   "OSKeyStore",
-  "resource://formautofill/OSKeyStore.jsm"
+  "resource:///modules/OSKeyStore.jsm"
 );
 
 class FormAutofillBase {

toolkit/modules/tests/browser/browser_CreditCard.js

@@ -6,9 +6,7 @@
 const { CreditCard } = ChromeUtils.import(
   "resource://gre/modules/CreditCard.jsm"
 );
-const { OSKeyStore } = ChromeUtils.import(
-  "resource://formautofill/OSKeyStore.jsm"
-);
+const { OSKeyStore } = ChromeUtils.import("resource:///modules/OSKeyStore.jsm");
 const { OSKeyStoreTestUtils } = ChromeUtils.import(
   "resource://testing-common/OSKeyStoreTestUtils.jsm"
 );