Bug 1868838 - Move ASRouter into browser/components/asrouter/modules. r=pdahiya,pip-reviewers,fxview-reviewers,sclements

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

Author: mikeconley

browser/actors/AboutNewTabParent.sys.mjs

@@ -11,7 +11,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter: "resource:///modules/asrouter/ASRouter.jsm",
 });
 
 // A mapping of loaded new tab pages, where the mapping is:

browser/actors/AboutPrivateBrowsingParent.sys.mjs

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 import { BrowserUtils } from "resource://gre/modules/BrowserUtils.sys.mjs";
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";

browser/components/BrowserGlue.sys.mjs

@@ -98,7 +98,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 XPCOMUtils.defineLazyModuleGetters(lazy, {
   ASRouterDefaultConfig:
     "resource:///modules/asrouter/ASRouterDefaultConfig.jsm",
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter: "resource:///modules/asrouter/ASRouter.jsm",
   OnboardingMessageProvider:
     "resource://activity-stream/lib/OnboardingMessageProvider.jsm",
 });

browser/components/aboutwelcome/karma.mc.config.js

@@ -161,6 +161,7 @@ module.exports = function (config) {
         },
         alias: {
           newtab: path.join(__dirname, "../newtab"),
+          asroutermodules: path.join(__dirname, "../asrouter/modules"),
         },
       },
       plugins: [

browser/components/aboutwelcome/modules/AWScreenUtils.jsm

@@ -9,7 +9,7 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
 const lazy = {};
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter: "resource:///modules/asrouter/ASRouter.jsm",
   ASRouterTargeting: "resource:///modules/asrouter/ASRouterTargeting.jsm",
 });
 

browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_attribution.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 const { AttributionCode } = ChromeUtils.importESModule(
   "resource:///modules/AttributionCode.sys.mjs"

browser/components/aboutwelcome/tests/browser/browser_aboutwelcome_rtamo.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 const { AddonRepository } = ChromeUtils.importESModule(
   "resource://gre/modules/addons/AddonRepository.sys.mjs"

browser/components/aboutwelcome/tests/unit/AWScreenUtils.test.jsx

@@ -1,6 +1,6 @@
 import { AWScreenUtils } from "modules/AWScreenUtils.jsm";
 import { GlobalOverrider } from "newtab/test/unit/utils";
-import { ASRouter } from "newtab/lib/ASRouter.jsm";
+import { ASRouter } from "asroutermodules/ASRouter.jsm";
 
 describe("AWScreenUtils", () => {
   let sandbox;

browser/components/asrouter/karma.mc.config.js

@@ -83,6 +83,12 @@ module.exports = function (config) {
               functions: 0,
               branches: 0,
             },
+            "modules/ASRouter.jsm": {
+              statements: 75,
+              lines: 75,
+              functions: 64,
+              branches: 66,
+            },
             "modules/ASRouterParentProcessMessageHandler.jsm": {
               statements: 98,
               lines: 98,

browser/components/newtab/lib/ASRouter.jsm renamed to browser/components/asrouter/modules/ASRouter.jsm

@@ -8,7 +8,7 @@
 const EXPORTED_SYMBOLS = ["ASRouterDefaultConfig"];
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 const { TelemetryFeed } = ChromeUtils.importESModule(
   "resource://activity-stream/lib/TelemetryFeed.sys.mjs"

browser/components/asrouter/modules/ASRouterDefaultConfig.jsm

@@ -15,6 +15,7 @@ FINAL_TARGET_FILES.actors += [
 ]
 
 EXTRA_JS_MODULES.asrouter += [
+    "modules/ASRouter.jsm",
     "modules/ASRouterDefaultConfig.jsm",
     "modules/ASRouterNewTabHook.sys.mjs",
     "modules/ASRouterParentProcessMessageHandler.jsm",

browser/components/asrouter/moz.build

@@ -8,7 +8,7 @@ const { ASRouterTriggerListeners } = ChromeUtils.import(
 );
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 const mockIdleService = {

browser/components/asrouter/tests/browser/browser_trigger_listeners.js

@@ -1,22 +1,22 @@
-import { _ASRouter, MessageLoaderUtils } from "lib/ASRouter.jsm";
-import { QueryCache } from "asroutermodules/ASRouterTargeting.jsm";
+import { _ASRouter, MessageLoaderUtils } from "modules/ASRouter.jsm";
+import { QueryCache } from "modules/ASRouterTargeting.jsm";
 import {
   FAKE_LOCAL_MESSAGES,
   FAKE_LOCAL_PROVIDER,
   FAKE_LOCAL_PROVIDERS,
   FAKE_REMOTE_MESSAGES,
   FAKE_REMOTE_PROVIDER,
   FAKE_REMOTE_SETTINGS_PROVIDER,
-} from "./constants";
+} from "test/unit/asrouter/constants";
 import {
   ASRouterPreferences,
   TARGETING_PREFERENCES,
-} from "asroutermodules/ASRouterPreferences.jsm";
-import { ASRouterTriggerListeners } from "asroutermodules/ASRouterTriggerListeners.jsm";
-import { CFRPageActions } from "lib/CFRPageActions.jsm";
+} from "modules/ASRouterPreferences.jsm";
+import { ASRouterTriggerListeners } from "modules/ASRouterTriggerListeners.jsm";
+import { CFRPageActions } from "newtab/lib/CFRPageActions.jsm";
 import { GlobalOverrider } from "test/unit/utils";
-import { PanelTestProvider } from "lib/PanelTestProvider.sys.mjs";
-import ProviderResponseSchema from "content-src/asrouter/schemas/provider-response.schema.json";
+import { PanelTestProvider } from "newtab/lib/PanelTestProvider.sys.mjs";
+import ProviderResponseSchema from "newtab/content-src/asrouter/schemas/provider-response.schema.json";
 
 const MESSAGE_PROVIDER_PREF_NAME =
   "browser.newtabpage.activity-stream.asrouter.providers.cfr";

browser/components/newtab/test/unit/asrouter/ASRouter.test.js renamed to browser/components/asrouter/tests/unit/ASRouter.test.js

@@ -1,5 +1,5 @@
 import { ASRouterParentProcessMessageHandler } from "modules/ASRouterParentProcessMessageHandler.jsm";
-import { _ASRouter } from "newtab/lib/ASRouter.jsm";
+import { _ASRouter } from "modules/ASRouter.jsm";
 import { MESSAGE_TYPE_HASH as msg } from "common/ActorConstants.sys.mjs";
 
 describe("ASRouterParentProcessMessageHandler", () => {

browser/components/asrouter/tests/unit/ASRouterParentProcessMessageHandler.test.js

@@ -13,7 +13,7 @@ ChromeUtils.defineESModuleGetters(this, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter: "resource:///modules/asrouter/ASRouter.jsm",
 });
 
 XPCOMUtils.defineLazyServiceGetter(

browser/components/doh/test/browser/head.js

@@ -3,7 +3,7 @@
 
 "use strict";
 const { MessageLoaderUtils } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 const { BuiltInThemes } = ChromeUtils.importESModule(

browser/components/firefoxview/tests/browser/browser_feature_callout.js

@@ -17,7 +17,7 @@ const {
 /* exported testVisibility */
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 const { UIState } = ChromeUtils.importESModule(
   "resource://services-sync/UIState.sys.mjs"

browser/components/firefoxview/tests/browser/head.js

@@ -82,12 +82,6 @@ module.exports = function (config) {
               functions: 94,
               branches: 66,
             },
-            "lib/ASRouter.jsm": {
-              statements: 75,
-              lines: 75,
-              functions: 64,
-              branches: 66,
-            },
             "content-src/asrouter/asrouter-utils.js": {
               statements: 66,
               lines: 66,

browser/components/newtab/karma.mc.config.js

@@ -4,7 +4,7 @@
 "use strict";
 
 const { ASRouter, MessageLoaderUtils } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 const { PanelTestProvider } = ChromeUtils.importESModule(
   "resource://activity-stream/lib/PanelTestProvider.sys.mjs"

browser/components/newtab/test/browser/browser_asrouter_bug1761522.js

@@ -3,7 +3,7 @@ const { ASRouterTriggerListeners } = ChromeUtils.import(
   "resource:///modules/asrouter/ASRouterTriggerListeners.jsm"
 );
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 const { CFRMessageProvider } = ChromeUtils.importESModule(
   "resource://activity-stream/lib/CFRMessageProvider.sys.mjs"

browser/components/newtab/test/browser/browser_asrouter_cfr.js

@@ -2,7 +2,7 @@ const { RemoteSettings } = ChromeUtils.importESModule(
   "resource://services-settings/remote-settings.sys.mjs"
 );
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 const { RemoteSettingsExperimentLoader } = ChromeUtils.importESModule(
   "resource://nimbus/lib/RemoteSettingsExperimentLoader.sys.mjs"

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

@@ -1,5 +1,5 @@
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 const { RemoteSettings } = ChromeUtils.importESModule(
   "resource://services-settings/remote-settings.sys.mjs"

browser/components/newtab/test/browser/browser_asrouter_group_frequency.js

@@ -1,5 +1,5 @@
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 const { RemoteSettings } = ChromeUtils.importESModule(
   "resource://services-settings/remote-settings.sys.mjs"

browser/components/newtab/test/browser/browser_asrouter_group_userprefs.js

@@ -10,7 +10,7 @@ const { CFRMessageProvider } = ChromeUtils.importESModule(
   "resource://activity-stream/lib/CFRMessageProvider.sys.mjs"
 );
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 add_task(async function show_and_send_telemetry() {

browser/components/newtab/test/browser/browser_asrouter_infobar.js

@@ -8,7 +8,7 @@ const { RemoteSettings } = ChromeUtils.importESModule(
   "resource://services-settings/remote-settings.sys.mjs"
 );
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 const HOMEPAGE_OVERRIDE_PREF = "browser.startup.homepage_override.once";

browser/components/newtab/test/browser/browser_asrouter_momentspagehub.js

@@ -4,7 +4,7 @@
 "use strict";
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 const { ASRouterTargeting } = ChromeUtils.import(

browser/components/newtab/test/browser/browser_foxdoodle_set_default.js

@@ -5,7 +5,7 @@
 requestLongerTimeout(5);
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 const { ExperimentFakes } = ChromeUtils.importESModule(

browser/components/newtab/test/browser/browser_newtab_ping.js

@@ -4,7 +4,7 @@
 "use strict";
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 let sendTriggerMessageSpy;

browser/components/newtab/test/browser/browser_newtab_trigger.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 const { RemoteSettings } = ChromeUtils.importESModule(
   "resource://services-settings/remote-settings.sys.mjs"

browser/components/newtab/test/browser/browser_trigger_messagesLoaded.js

@@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(this, {
   PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
 });
 XPCOMUtils.defineLazyModuleGetters(this, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter: "resource:///modules/asrouter/ASRouter.jsm",
   QueryCache: "resource:///modules/asrouter/ASRouterTargeting.jsm",
 });
 const { FxAccounts } = ChromeUtils.importESModule(

browser/components/newtab/test/browser/head.js

@@ -1,4 +1,4 @@
-import { MessageLoaderUtils } from "lib/ASRouter.jsm";
+import { MessageLoaderUtils } from "asroutermodules/ASRouter.jsm";
 const { STARTPAGE_VERSION } = MessageLoaderUtils;
 
 const FAKE_OPTIONS = {

browser/components/newtab/test/unit/asrouter/MessageLoaderUtils.test.js

@@ -5,7 +5,7 @@
 "use strict";
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 add_task(async function nested_objects() {

browser/components/newtab/test/xpcshell/test_ASRouter_getTargetingParameters.js

@@ -1,5 +1,5 @@
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 const promoImgSrc = "chrome://browser/content/assets/cookie-banners-begone.svg";

browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_cookie_banners_promo.js

@@ -2,7 +2,7 @@ const { Region } = ChromeUtils.importESModule(
   "resource://gre/modules/Region.sys.mjs"
 );
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 const initialHomeRegion = Region._home;

browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_focus_promo.js

@@ -13,7 +13,7 @@ ChromeUtils.defineESModuleGetters(this, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter: "resource:///modules/asrouter/ASRouter.jsm",
 });
 
 function whenNewWindowLoaded(aOptions, aCallback) {

browser/components/privatebrowsing/test/browser/head.js

@@ -13,7 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter: "resource:///modules/asrouter/ASRouter.jsm",
 });
 
 const OPTED_IN_PREF = "browser.shopping.experience2023.optedIn";

browser/components/shopping/ShoppingUtils.sys.mjs

@@ -8,7 +8,7 @@ ChromeUtils.defineESModuleGetters(this, {
 });
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 
 const { FeatureCalloutMessages } = ChromeUtils.importESModule(

browser/components/shopping/tests/browser/browser_shopping_message_triggers.js

@@ -13,7 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter: "resource:///modules/asrouter/ASRouter.jsm",
 });
 
 const TRANSITION_MS = 500;

browser/modules/FeatureCallout.sys.mjs

@@ -14,7 +14,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter: "resource:///modules/asrouter/ASRouter.jsm",
 });
 
 const ACTION_ID_BOOKMARK = "bookmark";

browser/modules/PageActions.sys.mjs

@@ -54,7 +54,8 @@
 import { EXIT_CODE } from "resource://gre/modules/BackgroundTasksManager.sys.mjs";
 
 const { ASRouter } = ChromeUtils.import(
-  "resource://activity-stream/lib/ASRouter.jsm"
+  // eslint-disable-next-line mozilla/no-browser-refs-in-toolkit
+  "resource:///modules/asrouter/ASRouter.jsm"
 );
 import { BackgroundTasksUtils } from "resource://gre/modules/BackgroundTasksUtils.sys.mjs";
 import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";

toolkit/components/backgroundtasks/BackgroundTask_message.sys.mjs

@@ -36,7 +36,9 @@ ChromeUtils.defineESModuleGetters(lazy, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter:
+    // eslint-disable-next-line mozilla/no-browser-refs-in-toolkit
+    "resource:///modules/asrouter/ASRouter.jsm",
 
   ASRouterDefaultConfig:
     // eslint-disable-next-line mozilla/no-browser-refs-in-toolkit

toolkit/components/backgroundtasks/BackgroundTasksUtils.sys.mjs

@@ -14,7 +14,9 @@ XPCOMUtils.defineLazyServiceGetters(lazy, {
 });
 
 XPCOMUtils.defineLazyModuleGetters(lazy, {
-  ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
+  ASRouter:
+    // eslint-disable-next-line mozilla/no-browser-refs-in-toolkit
+    "resource:///modules/asrouter/ASRouter.jsm",
 });
 
 ChromeUtils.defineESModuleGetters(lazy, {