Bug 1868838 - Move OnboardingMessageProvider to browser/components/asrouter/modules. r=pdahiya

Differential Revision: https://phabricator.services.mozilla.com/D198997
2024-01-29 18:52:28 +00:00 · 2024-01-29 18:52:28 +00:00 · 3de067b43e
commit 3de067b43e
parent dacb737d4a
17 changed files with 16 additions and 18 deletions
--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
@ -100,7 +100,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
    "resource:///modules/asrouter/ASRouterDefaultConfig.jsm",
  ASRouter: "resource:///modules/asrouter/ASRouter.jsm",
  OnboardingMessageProvider:
-    "resource://activity-stream/lib/OnboardingMessageProvider.jsm",
+    "resource:///modules/asrouter/OnboardingMessageProvider.jsm",
 });

 if (AppConstants.MOZ_UPDATER) {
--- a/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_upgrade_multistage_mr.js
+++ b/browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_upgrade_multistage_mr.js
@ -1,7 +1,7 @@
 "use strict";

 const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+  "resource:///modules/asrouter/OnboardingMessageProvider.jsm"
 );
 const { SpecialMessageActions } = ChromeUtils.importESModule(
  "resource://messaging-system/lib/SpecialMessageActions.sys.mjs"
--- a/browser/components/asrouter/content-src/schemas/extract-test-corpus.js
+++ b/browser/components/asrouter/content-src/schemas/extract-test-corpus.js
@ -8,7 +8,7 @@ const { CFRMessageProvider } = ChromeUtils.importESModule(
  "resource:///modules/asrouter/CFRMessageProvider.sys.mjs"
 );
 const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+  "resource:///modules/asrouter/OnboardingMessageProvider.jsm"
 );
 const { PanelTestProvider } = ChromeUtils.importESModule(
  "resource://activity-stream/lib/PanelTestProvider.sys.mjs"
--- a/browser/components/asrouter/karma.mc.config.js
+++ b/browser/components/asrouter/karma.mc.config.js
@ -211,6 +211,7 @@ module.exports = function (config) {
              path.resolve("modules/ASRouterTriggerListeners.jsm"),
              path.resolve("modules/CFRMessageProvider.sys.mjs"),
              path.resolve("modules/CFRPageActions.jsm"),
+              path.resolve("modules/OnboardingMessageProvider.jsm"),
            ],
          },
        ],
--- a/browser/components/asrouter/modules/ASRouter.jsm
+++ b/browser/components/asrouter/modules/ASRouter.jsm
@ -62,7 +62,7 @@ const { CFRMessageProvider } = ChromeUtils.importESModule(
  "resource:///modules/asrouter/CFRMessageProvider.sys.mjs"
 );
 const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+  "resource:///modules/asrouter/OnboardingMessageProvider.jsm"
 );
 const { RemoteSettings } = ChromeUtils.importESModule(
  "resource://services-settings/remote-settings.sys.mjs"
--- a/browser/components/asrouter/modules/OnboardingMessageProvider.jsm
+++ b/browser/components/asrouter/modules/OnboardingMessageProvider.jsm
--- a/browser/components/asrouter/moz.build
+++ b/browser/components/asrouter/moz.build
@ -25,6 +25,7 @@ EXTRA_JS_MODULES.asrouter += [
    "modules/CFRMessageProvider.sys.mjs",
    "modules/CFRPageActions.jsm",
    "modules/MessagingExperimentConstants.sys.mjs",
+    "modules/OnboardingMessageProvider.jsm",
    "modules/RemoteL10n.sys.mjs",
 ]

--- a/browser/components/asrouter/tests/unit/ASRouterTargeting.test.js
+++ b/browser/components/asrouter/tests/unit/ASRouterTargeting.test.js
@ -4,7 +4,7 @@ import {
  getSortedMessages,
  QueryCache,
 } from "modules/ASRouterTargeting.jsm";
-import { OnboardingMessageProvider } from "newtab/lib/OnboardingMessageProvider.jsm";
+import { OnboardingMessageProvider } from "modules/OnboardingMessageProvider.jsm";
 import { ASRouterPreferences } from "modules/ASRouterPreferences.jsm";
 import { GlobalOverrider } from "test/unit/utils";

--- a/browser/components/asrouter/tests/xpcshell/test_OnboardingMessageProvider.js
+++ b/browser/components/asrouter/tests/xpcshell/test_OnboardingMessageProvider.js
@ -2,7 +2,7 @@
   http://creativecommons.org/publicdomain/zero/1.0/ */

 const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+  "resource:///modules/asrouter/OnboardingMessageProvider.jsm"
 );
 const { sinon } = ChromeUtils.importESModule(
  "resource://testing-common/Sinon.sys.mjs"
--- a/browser/components/newtab/karma.mc.config.js
+++ b/browser/components/newtab/karma.mc.config.js
@ -307,11 +307,7 @@ module.exports = function (config) {
              path.resolve("lib"),
              path.resolve("common"),
            ],
-            exclude: [
-              path.resolve("test"),
-              path.resolve("vendor"),
-              path.resolve("lib/OnboardingMessageProvider.jsm"),
-            ],
+            exclude: [path.resolve("test"), path.resolve("vendor")],
          },
        ],
      },
--- a/browser/components/newtab/test/browser/browser_asrouter_toolbarbadge.js
+++ b/browser/components/newtab/test/browser/browser_asrouter_toolbarbadge.js
@ -1,5 +1,5 @@
 const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+  "resource:///modules/asrouter/OnboardingMessageProvider.jsm"
 );
 const { ToolbarBadgeHub } = ChromeUtils.import(
  "resource://activity-stream/lib/ToolbarBadgeHub.jsm"
--- a/browser/components/newtab/test/browser/browser_foxdoodle_set_default.js
+++ b/browser/components/newtab/test/browser/browser_foxdoodle_set_default.js
@ -12,7 +12,7 @@ const { ASRouterTargeting } = ChromeUtils.import(
 );

 const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+  "resource:///modules/asrouter/OnboardingMessageProvider.jsm"
 );

 async function waitForClick(selector, win) {
--- a/browser/components/newtab/test/unit/lib/ToolbarBadgeHub.test.js
+++ b/browser/components/newtab/test/unit/lib/ToolbarBadgeHub.test.js
@ -1,6 +1,6 @@
 import { _ToolbarBadgeHub } from "lib/ToolbarBadgeHub.jsm";
 import { GlobalOverrider } from "test/unit/utils";
-import { OnboardingMessageProvider } from "lib/OnboardingMessageProvider.jsm";
+import { OnboardingMessageProvider } from "asrouter/modules/OnboardingMessageProvider.jsm";
 import { _ToolbarPanelHub, ToolbarPanelHub } from "lib/ToolbarPanelHub.jsm";

 describe("ToolbarBadgeHub", () => {
--- a/browser/components/tests/browser/browser_browserGlue_upgradeDialog_trigger.js
+++ b/browser/components/tests/browser/browser_browserGlue_upgradeDialog_trigger.js
@ -10,7 +10,7 @@ const { ExperimentAPI } = ChromeUtils.importESModule(
  "resource://nimbus/ExperimentAPI.sys.mjs"
 );
 const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+  "resource:///modules/asrouter/OnboardingMessageProvider.jsm"
 );

 XPCOMUtils.defineLazyServiceGetters(this, {
--- a/taskcluster/ci/source-test/python.yml
+++ b/taskcluster/ci/source-test/python.yml
@ -465,7 +465,7 @@ fxms-schemas:
            - 'browser/components/newtab/content-src/asrouter/schemas/extract-test-corpus.js'
            - 'browser/components/newtab/content-src/asrouter/schemas/make-schemas.py'
            - 'browser/components/newtab/content-src/**/*.schema.json'
-            - 'browser/components/newtab/lib/OnboardingMessageProvider.jsm'
+            - 'browser/components/asrouter/modules/OnboardingMessageProvider.jsm'
            - 'browser/components/newtab/lib/PanelTestProvider.sys.mjs'

 condprof:
--- a/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_open_spotlight_dialog.js
+++ b/toolkit/components/messaging-system/schemas/SpecialMessageActionSchemas/test/browser/browser_sma_open_spotlight_dialog.js
@ -4,7 +4,7 @@
 "use strict";

 const { OnboardingMessageProvider } = ChromeUtils.import(
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm"
+  "resource:///modules/asrouter/OnboardingMessageProvider.jsm"
 );

 const { Spotlight } = ChromeUtils.import(
--- a/tools/esmify/map.json
+++ b/tools/esmify/map.json
@ -247,6 +247,7 @@
  "resource:///modules/asrouter/ASRouterTargeting.jsm": "browser/components/asrouter/modules/ASRouterTargeting.jsm",
  "resource:///modules/asrouter/ASRouterTriggerListeners.jsm": "browser/components/asrouter/modules/ASRouterTriggerListeners.jsm",
  "resource:///modules/asrouter/CFRPageActions.jsm": "browser/components/asrouter/modules/CFRPageActions.jsm",
+  "resource:///modules/asrouter/OnboardingMessageProvider.jsm": "browser/components/asrouter/modules/OnboardingMessageProvider.jsm",
  "resource:///modules/distribution.js": "browser/components/distribution.js",
  "resource:///modules/pagedata/OpenGraphPageData.jsm": "browser/components/pagedata/OpenGraphPageData.jsm",
  "resource:///modules/pagedata/PageDataSchema.jsm": "browser/components/pagedata/PageDataSchema.jsm",
@ -306,7 +307,6 @@
  "resource://activity-stream/lib/LinksCache.jsm": "browser/components/newtab/lib/LinksCache.jsm",
  "resource://activity-stream/lib/MomentsPageHub.jsm": "browser/components/newtab/lib/MomentsPageHub.jsm",
  "resource://activity-stream/lib/NewTabInit.jsm": "browser/components/newtab/lib/NewTabInit.jsm",
-  "resource://activity-stream/lib/OnboardingMessageProvider.jsm": "browser/components/newtab/lib/OnboardingMessageProvider.jsm",
  "resource://activity-stream/lib/PanelTestProvider.jsm": "browser/components/newtab/lib/PanelTestProvider.jsm",
  "resource://activity-stream/lib/PersistentCache.jsm": "browser/components/newtab/lib/PersistentCache.jsm",
  "resource://activity-stream/lib/PersonalityProvider/NaiveBayesTextTagger.jsm": "browser/components/newtab/lib/PersonalityProvider/NaiveBayesTextTagger.jsm",