Bug 1692230 - Move nimbus code to its own directory r=andreio

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

browser/actors/AboutNewTabChild.jsm

@@ -19,8 +19,7 @@ const { PrivateBrowsingUtils } = ChromeUtils.import(
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  ExperimentFeature:
-    "resource://messaging-system/experiments/ExperimentAPI.jsm",
+  ExperimentFeature: "resource://nimbus/ExperimentAPI.jsm",
 });
 
 XPCOMUtils.defineLazyPreferenceGetter(

browser/base/content/browser.js

@@ -586,7 +586,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
    to access experiment values */
 XPCOMUtils.defineLazyGetter(this, "aboutWelcomeFeature", () => {
   const { ExperimentFeature } = ChromeUtils.import(
-    "resource://messaging-system/experiments/ExperimentAPI.jsm"
+    "resource://nimbus/ExperimentAPI.jsm"
   );
   return new ExperimentFeature("aboutwelcome");
 });

browser/components/BrowserGlue.jsm

@@ -44,7 +44,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
     "resource:///modules/DownloadsViewableInternally.jsm",
   E10SUtils: "resource://gre/modules/E10SUtils.jsm",
   ExtensionsUI: "resource:///modules/ExtensionsUI.jsm",
-  ExperimentAPI: "resource://messaging-system/experiments/ExperimentAPI.jsm",
+  ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
   FeatureGate: "resource://featuregates/FeatureGate.jsm",
   FirefoxMonitor: "resource:///modules/FirefoxMonitor.jsm",
   FxAccounts: "resource://gre/modules/FxAccounts.jsm",

browser/components/newtab/AboutNewTabService.jsm

@@ -43,7 +43,7 @@ const { E10SUtils } = ChromeUtils.import(
 
 XPCOMUtils.defineLazyGetter(this, "awExperimentFeature", () => {
   const { ExperimentFeature } = ChromeUtils.import(
-    "resource://messaging-system/experiments/ExperimentAPI.jsm"
+    "resource://nimbus/ExperimentAPI.jsm"
   );
   return new ExperimentFeature("aboutwelcome");
 });

browser/components/newtab/aboutwelcome/AboutWelcomeChild.jsm

@@ -12,7 +12,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   DEFAULT_SITES: "resource://activity-stream/lib/DefaultSites.jsm",
-  ExperimentAPI: "resource://messaging-system/experiments/ExperimentAPI.jsm",
+  ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
   shortURL: "resource://activity-stream/lib/ShortURL.jsm",
   TippyTopProvider: "resource://activity-stream/lib/TippyTopProvider.jsm",
 });

browser/components/newtab/lib/ASRouter.jsm

@@ -29,7 +29,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   KintoHttpClient: "resource://services-common/kinto-http-client.js",
   Downloader: "resource://services-settings/Attachments.jsm",
   RemoteL10n: "resource://activity-stream/lib/RemoteL10n.jsm",
-  ExperimentAPI: "resource://messaging-system/experiments/ExperimentAPI.jsm",
+  ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
   SpecialMessageActions:
     "resource://messaging-system/lib/SpecialMessageActions.jsm",
   TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",

browser/components/newtab/lib/AboutPreferences.jsm

@@ -16,7 +16,7 @@ const PREFERENCES_LOADED_EVENT = "home-pane-loaded";
 
 XPCOMUtils.defineLazyGetter(this, "aboutNewTabFeature", () => {
   const { ExperimentFeature } = ChromeUtils.import(
-    "resource://messaging-system/experiments/ExperimentAPI.jsm"
+    "resource://nimbus/ExperimentAPI.jsm"
   );
   return new ExperimentFeature("newtab");
 });

browser/components/newtab/lib/PrefsFeed.jsm

@@ -28,7 +28,7 @@ ChromeUtils.defineModuleGetter(
 
 XPCOMUtils.defineLazyGetter(this, "aboutNewTabFeature", () => {
   const { ExperimentFeature } = ChromeUtils.import(
-    "resource://messaging-system/experiments/ExperimentAPI.jsm"
+    "resource://nimbus/ExperimentAPI.jsm"
   );
   return new ExperimentFeature("newtab");
 });

browser/components/newtab/lib/SectionsManager.jsm

@@ -25,7 +25,7 @@ ChromeUtils.defineModuleGetter(
 
 XPCOMUtils.defineLazyGetter(this, "aboutNewTabFeature", () => {
   const { ExperimentFeature } = ChromeUtils.import(
-    "resource://messaging-system/experiments/ExperimentAPI.jsm"
+    "resource://nimbus/ExperimentAPI.jsm"
   );
 
   return new ExperimentFeature("newtab");

browser/components/newtab/lib/TelemetryFeed.jsm

@@ -64,7 +64,7 @@ ChromeUtils.defineModuleGetter(
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  ExperimentAPI: "resource://messaging-system/experiments/ExperimentAPI.jsm",
+  ExperimentAPI: "resource://nimbus/ExperimentAPI.jsm",
   TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
   TelemetrySession: "resource://gre/modules/TelemetrySession.jsm",
 });

browser/components/newtab/test/browser/browser_aboutwelcome_multistage.js

@@ -1,10 +1,10 @@
 "use strict";
 
 const { ExperimentAPI } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentAPI.jsm"
+  "resource://nimbus/ExperimentAPI.jsm"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 
 const SEPARATE_ABOUT_WELCOME_PREF = "browser.aboutwelcome.enabled";

browser/components/newtab/test/browser/browser_asrouter_experimentsAPILoader.js

@@ -5,13 +5,13 @@ const { ASRouter } = ChromeUtils.import(
   "resource://activity-stream/lib/ASRouter.jsm"
 );
 const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
-  "resource://messaging-system/lib/RemoteSettingsExperimentLoader.jsm"
+  "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"
 );
 const { ExperimentAPI } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentAPI.jsm"
+  "resource://nimbus/ExperimentAPI.jsm"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { TelemetryFeed } = ChromeUtils.import(
   "resource://activity-stream/lib/TelemetryFeed.jsm"

browser/components/newtab/test/browser/browser_newtab_experimentFeature.js

@@ -4,10 +4,10 @@
 "use strict";
 
 const { ExperimentManager } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 
 add_task(async function test_enroll_newNewtabExperience() {

browser/components/newtab/test/browser/browser_newtab_experiment_api.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const { ExperimentAPI } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentAPI.jsm"
+  "resource://nimbus/ExperimentAPI.jsm"
 );
 
 /**

toolkit/components/messaging-system/experiments/@types/ExperimentManager.d.ts

@@ -1,49 +0,0 @@
-export interface FeatureConfig {
-  featureId: "cfr" | "aboutwelcome";
-  enabled: boolean;
-  value: { [key: string]: any } | null;
-}
-
-export interface Branch {
-  slug: string;
-  ratio: number;
-  feature: FeatureConfig;
-}
-
-interface BucketConfig {
-  namespace: string;
-  randomizationUnit: string;
-  start: number;
-  count: number;
-  total: number;
-}
-
-export interface RecipeArgs {
-  slug: string;
-  isEnrollmentPaused: boolean;
-  experimentType?: string;
-  branches: Branch[];
-  bucketConfig: BucketConfig;
-}
-
-export interface Recipe {
-  id: string;
-  // Processed by Remote Settings, Normandy
-  filter_expression?: string;
-  // Processed by RemoteSettingsExperimentLoader
-  targeting?: string;
-  arguments: RecipeArgs;
-}
-
-export interface Enrollment {
-  slug: string;
-  enrollmentId: string;
-  branch: Branch;
-  active: boolean;
-  experimentType: string;
-  source: string;
-  // Shown in about:studies
-  userFacingName: string;
-  userFacingDescription: string;
-  lastSeen: string;
-}

toolkit/components/messaging-system/jar.mn

@@ -4,6 +4,5 @@
 
 toolkit.jar:
 % resource messaging-system %res/messaging-system/
-  res/messaging-system/experiments/ (./experiments/*)
   res/messaging-system/lib/ (./lib/*)
   res/messaging-system/targeting/Targeting.jsm (./targeting/Targeting.jsm)

toolkit/components/messaging-system/moz.build

@@ -10,20 +10,15 @@ with Files("**"):
 BROWSER_CHROME_MANIFESTS += [
     "schemas/SpecialMessageActionSchemas/test/browser/browser.ini",
     "schemas/TriggerActionSchemas/test/browser/browser.ini",
-    "test/browser/browser.ini",
 ]
 
 SPHINX_TREES["docs"] = "schemas"
 
-XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
 XPCSHELL_TESTS_MANIFESTS += ["targeting/test/unit/xpcshell.ini"]
 
 TESTING_JS_MODULES += [
-    "schemas/ExperimentFeatureManifest.schema.json",
-    "schemas/NimbusExperiment.schema.json",
     "schemas/SpecialMessageActionSchemas/SpecialMessageActionSchemas.json",
     "schemas/TriggerActionSchemas/TriggerActionSchemas.json",
-    "test/MSTestUtils.jsm",
 ]
 
 JAR_MANIFESTS += ["jar.mn"]

toolkit/components/moz.build

@@ -127,7 +127,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] != "android":
     ]
 
 if CONFIG["MOZ_BUILD_APP"] == "browser":
-    DIRS += ["normandy", "messaging-system"]
+    DIRS += ["normandy", "nimbus", "messaging-system"]
 
 if CONFIG["MOZ_BACKGROUNDTASKS"]:
     DIRS += ["backgroundtasks"]

toolkit/components/nimbus/ExperimentAPI.jsm

@@ -56,10 +56,8 @@ const { XPCOMUtils } = ChromeUtils.import(
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  ExperimentStore:
-    "resource://messaging-system/experiments/ExperimentStore.jsm",
-  ExperimentManager:
-    "resource://messaging-system/experiments/ExperimentManager.jsm",
+  ExperimentStore: "resource://nimbus/lib/ExperimentStore.jsm",
+  ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
 });
 

toolkit/components/nimbus/jar.mn

@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+toolkit.jar:
+% resource nimbus %res/nimbus/
+  res/nimbus/lib/ (./lib/*)
+  res/nimbus/ExperimentAPI.jsm (./ExperimentAPI.jsm)

toolkit/components/nimbus/lib/ExperimentManager.jsm

@@ -19,8 +19,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",
-  ExperimentStore:
-    "resource://messaging-system/experiments/ExperimentStore.jsm",
+  ExperimentStore: "resource://nimbus/lib/ExperimentStore.jsm",
   NormandyUtils: "resource://normandy/lib/NormandyUtils.jsm",
   Sampling: "resource://gre/modules/components-utils/Sampling.jsm",
   TelemetryEvents: "resource://normandy/lib/TelemetryEvents.jsm",

toolkit/components/nimbus/lib/ExperimentStore.jsm

@@ -12,7 +12,7 @@
 const EXPORTED_SYMBOLS = ["ExperimentStore"];
 
 const { SharedDataMap } = ChromeUtils.import(
-  "resource://messaging-system/lib/SharedDataMap.jsm"
+  "resource://nimbus/lib/SharedDataMap.jsm"
 );
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"

toolkit/components/nimbus/lib/RemoteSettingsExperimentLoader.jsm

@@ -21,8 +21,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 XPCOMUtils.defineLazyModuleGetters(this, {
   ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
   TargetingContext: "resource://messaging-system/targeting/Targeting.jsm",
-  ExperimentManager:
-    "resource://messaging-system/experiments/ExperimentManager.jsm",
+  ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",
   RemoteSettings: "resource://services-settings/remote-settings.js",
   CleanupManager: "resource://normandy/lib/CleanupManager.jsm",
 });

toolkit/components/nimbus/moz.build

@@ -0,0 +1,22 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+with Files("**"):
+    BUG_COMPONENT = ("Firefox", "Nimbus Desktop Client")
+
+BROWSER_CHROME_MANIFESTS += [
+    "test/browser/browser.ini",
+]
+
+XPCSHELL_TESTS_MANIFESTS += ["test/unit/xpcshell.ini"]
+
+TESTING_JS_MODULES += [
+    "schemas/ExperimentFeatureManifest.schema.json",
+    "schemas/NimbusExperiment.schema.json",
+    "test/NimbusTestUtils.jsm",
+]
+
+JAR_MANIFESTS += ["jar.mn"]

toolkit/components/nimbus/test/NimbusTestUtils.jsm

@@ -10,14 +10,12 @@ const { XPCOMUtils } = ChromeUtils.import(
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  _ExperimentManager:
-    "resource://messaging-system/experiments/ExperimentManager.jsm",
-  ExperimentStore:
-    "resource://messaging-system/experiments/ExperimentStore.jsm",
+  _ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",
+  ExperimentStore: "resource://nimbus/lib/ExperimentStore.jsm",
   NormandyUtils: "resource://normandy/lib/NormandyUtils.jsm",
   FileTestUtils: "resource://testing-common/FileTestUtils.jsm",
   _RemoteSettingsExperimentLoader:
-    "resource://messaging-system/lib/RemoteSettingsExperimentLoader.jsm",
+    "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm",
   Ajv: "resource://testing-common/ajv-4.1.1.js",
 });
 

toolkit/components/nimbus/test/browser/browser_experiment_evaluate_jexl.js

@@ -1,13 +1,13 @@
 "use strict";
 
 const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
-  "resource://messaging-system/lib/RemoteSettingsExperimentLoader.jsm"
+  "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"
 );
 const { ExperimentManager } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 
 add_task(async function setup() {

toolkit/components/nimbus/test/browser/browser_experimentstore_load.js

@@ -4,7 +4,7 @@
 "use strict";
 
 const { ExperimentStore } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentStore.jsm"
+  "resource://nimbus/lib/ExperimentStore.jsm"
 );
 ChromeUtils.defineModuleGetter(
   this,

toolkit/components/nimbus/test/browser/browser_remotesettings_experiment_enroll.js

@@ -4,16 +4,16 @@ const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
 );
 const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
-  "resource://messaging-system/lib/RemoteSettingsExperimentLoader.jsm"
+  "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"
 );
 const { ExperimentAPI } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentAPI.jsm"
+  "resource://nimbus/ExperimentAPI.jsm"
 );
 const { ExperimentManager } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 
 let rsClient;

toolkit/components/nimbus/test/browser/browser_remotesettingsexperimentloader_init.js

@@ -7,16 +7,16 @@ const {
   RemoteSettingsExperimentLoader,
   _RemoteSettingsExperimentLoader,
 } = ChromeUtils.import(
-  "resource://messaging-system/lib/RemoteSettingsExperimentLoader.jsm"
+  "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"
 );
 const { RemoteSettings } = ChromeUtils.import(
   "resource://services-settings/remote-settings.js"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { ExperimentManager } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 const { BrowserTestUtils } = ChromeUtils.import(
   "resource://testing-common/BrowserTestUtils.jsm"

toolkit/components/nimbus/test/unit/test_ExperimentAPI.js

@@ -1,10 +1,10 @@
 "use strict";
 
 const { ExperimentAPI, ExperimentFeature } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentAPI.jsm"
+  "resource://nimbus/ExperimentAPI.jsm"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { TestUtils } = ChromeUtils.import(
   "resource://testing-common/TestUtils.jsm"

toolkit/components/nimbus/test/unit/test_ExperimentAPI_ExperimentFeature.js

@@ -1,10 +1,10 @@
 "use strict";
 
 const { ExperimentAPI, ExperimentFeature } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentAPI.jsm"
+  "resource://nimbus/ExperimentAPI.jsm"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { TestUtils } = ChromeUtils.import(
   "resource://testing-common/TestUtils.jsm"

toolkit/components/nimbus/test/unit/test_ExperimentManager_context.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 
 const { FirstStartup } = ChromeUtils.import(

toolkit/components/nimbus/test/unit/test_ExperimentManager_enroll.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { NormandyTestUtils } = ChromeUtils.import(
   "resource://testing-common/NormandyTestUtils.jsm"

toolkit/components/nimbus/test/unit/test_ExperimentManager_generateTestIds.js

@@ -1,6 +1,6 @@
 "use strict";
 const { ExperimentManager } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 
 const TEST_CONFIG = {

toolkit/components/nimbus/test/unit/test_ExperimentManager_lifecycle.js

@@ -1,13 +1,13 @@
 "use strict";
 
 const { _ExperimentManager } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 const { ExperimentStore } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentStore.jsm"
+  "resource://nimbus/lib/ExperimentStore.jsm"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { Sampling } = ChromeUtils.import(
   "resource://gre/modules/components-utils/Sampling.jsm"

toolkit/components/nimbus/test/unit/test_ExperimentManager_unenroll.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { NormandyTestUtils } = ChromeUtils.import(
   "resource://testing-common/NormandyTestUtils.jsm"

toolkit/components/nimbus/test/unit/test_ExperimentStore.js

@@ -3,10 +3,10 @@
 const SYNC_DATA_PREF_BRANCH = "nimbus.syncdatastore.";
 
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { ExperimentStore } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentStore.jsm"
+  "resource://nimbus/lib/ExperimentStore.jsm"
 );
 
 // Experiment store caches in prefs Enrollments for fast sync access

toolkit/components/nimbus/test/unit/test_NimbusTestUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const { ExperimentFakes, ExperimentTestUtils } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 
 add_task(async function test_recipe_fake_validates() {

toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader.js

@@ -1,18 +1,18 @@
 "use strict";
 
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { CleanupManager } = ChromeUtils.import(
   "resource://normandy/lib/CleanupManager.jsm"
 );
 
 const { ExperimentManager } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 
 const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
-  "resource://messaging-system/lib/RemoteSettingsExperimentLoader.jsm"
+  "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"
 );
 
 const ENABLED_PREF = "messaging-system.rsexperimentloader.enabled";

toolkit/components/nimbus/test/unit/test_RemoteSettingsExperimentLoader_updateRecipes.js

@@ -1,16 +1,16 @@
 "use strict";
 
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { CleanupManager } = ChromeUtils.import(
   "resource://normandy/lib/CleanupManager.jsm"
 );
 const { ExperimentManager } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 const { RemoteSettingsExperimentLoader } = ChromeUtils.import(
-  "resource://messaging-system/lib/RemoteSettingsExperimentLoader.jsm"
+  "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm"
 );
 const { FirstStartup } = ChromeUtils.import(
   "resource://gre/modules/FirstStartup.jsm"

toolkit/components/nimbus/test/unit/test_SharedDataMap.js

@@ -1,5 +1,5 @@
 const { SharedDataMap } = ChromeUtils.import(
-  "resource://messaging-system/lib/SharedDataMap.jsm"
+  "resource://nimbus/lib/SharedDataMap.jsm"
 );
 const { FileTestUtils } = ChromeUtils.import(
   "resource://testing-common/FileTestUtils.jsm"
@@ -8,7 +8,7 @@ const { TestUtils } = ChromeUtils.import(
   "resource://testing-common/TestUtils.jsm"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 
 const PATH = FileTestUtils.getTempFile("shared-data-map").path;

toolkit/components/nimbus/test/unit/xpcshell.ini

@@ -11,7 +11,7 @@ support-files =
 [test_ExperimentManager_unenroll.js]
 [test_ExperimentManager_generateTestIds.js]
 [test_ExperimentStore.js]
-[test_MSTestUtils.js]
+[test_NimbusTestUtils.js]
 [test_SharedDataMap.js]
 [test_ExperimentAPI.js]
 [test_ExperimentAPI_ExperimentFeature.js]

toolkit/components/normandy/Normandy.jsm

@@ -24,10 +24,9 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   ShieldPreferences: "resource://normandy/lib/ShieldPreferences.jsm",
   TelemetryUtils: "resource://gre/modules/TelemetryUtils.jsm",
   TelemetryEvents: "resource://normandy/lib/TelemetryEvents.jsm",
-  ExperimentManager:
-    "resource://messaging-system/experiments/ExperimentManager.jsm",
+  ExperimentManager: "resource://nimbus/lib/ExperimentManager.jsm",
   RemoteSettingsExperimentLoader:
-    "resource://messaging-system/lib/RemoteSettingsExperimentLoader.jsm",
+    "resource://nimbus/lib/RemoteSettingsExperimentLoader.jsm",
 });
 
 var EXPORTED_SYMBOLS = ["Normandy"];

toolkit/components/normandy/actions/MessagingExperimentAction.jsm

@@ -11,7 +11,7 @@ const { BaseStudyAction } = ChromeUtils.import(
 ChromeUtils.defineModuleGetter(
   this,
   "ExperimentManager",
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 
 ChromeUtils.defineModuleGetter(

toolkit/components/normandy/content/AboutPages.jsm

@@ -31,7 +31,7 @@ ChromeUtils.defineModuleGetter(
 ChromeUtils.defineModuleGetter(
   this,
   "ExperimentManager",
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 
 var EXPORTED_SYMBOLS = ["AboutPages"];

toolkit/components/normandy/test/browser/browser_about_studies.js

@@ -7,10 +7,10 @@ const { RecipeRunner } = ChromeUtils.import(
   "resource://normandy/lib/RecipeRunner.jsm"
 );
 const { ExperimentFakes } = ChromeUtils.import(
-  "resource://testing-common/MSTestUtils.jsm"
+  "resource://testing-common/NimbusTestUtils.jsm"
 );
 const { ExperimentManager } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 
 const { NormandyTestUtils } = ChromeUtils.import(

toolkit/components/normandy/test/browser/browser_actions_MessagingExperimentAction.js

@@ -9,7 +9,7 @@ const { MessagingExperimentAction } = ChromeUtils.import(
 );
 
 const { _ExperimentManager, ExperimentManager } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentManager.jsm"
+  "resource://nimbus/lib/ExperimentManager.jsm"
 );
 
 decorate_task(

toolkit/components/passwordmgr/LoginManagerParent.jsm

@@ -17,7 +17,7 @@ const LoginInfo = new Components.Constructor(
 
 XPCOMUtils.defineLazyGetter(this, "autocompleteFeature", () => {
   const { ExperimentFeature } = ChromeUtils.import(
-    "resource://messaging-system/experiments/ExperimentAPI.jsm"
+    "resource://nimbus/ExperimentAPI.jsm"
   );
   return new ExperimentFeature("password-autocomplete");
 });

toolkit/components/passwordmgr/test/browser/browser_autocomplete_import.js

@@ -2,7 +2,7 @@ const { ChromeMigrationUtils } = ChromeUtils.import(
   "resource:///modules/ChromeMigrationUtils.jsm"
 );
 const { ExperimentAPI } = ChromeUtils.import(
-  "resource://messaging-system/experiments/ExperimentAPI.jsm"
+  "resource://nimbus/ExperimentAPI.jsm"
 );
 const { MigrationUtils } = ChromeUtils.import(
   "resource:///modules/MigrationUtils.jsm"