fixup! Bug 31740: Remove some unnecessary RemoteSettings instances (82de2705) · Commits · morgan / Mullvad Browser

browser/components/BrowserGlue.jsm

+0 −31

Original line number	Diff line number	Diff line
		@@ -22,9 +22,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
		ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm",
		AddonManager: "resource://gre/modules/AddonManager.jsm",
		AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm",
		ASRouterDefaultConfig:
		"resource://activity-stream/lib/ASRouterDefaultConfig.jsm",
		ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm",
		ASRouter: "resource://activity-stream/lib/ASRouter.jsm",
		AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm",
		BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm",
		@@ -716,27 +713,6 @@ let JSWINDOWACTORS = {
		matches: ["about:studies*"],
		},

		ASRouter: {
		parent: {
		moduleURI: "resource:///actors/ASRouterParent.jsm",
		},
		child: {
		moduleURI: "resource:///actors/ASRouterChild.jsm",
		events: {
		// This is added so the actor instantiates immediately and makes
		// methods available to the page js on load.
		DOMDocElementInserted: {},
		},
		},
		matches: [
		"about:home*",
		"about:newtab*",
		"about:welcome*",
		"about:privatebrowsing",
		],
		remoteTypes: ["privilegedabout"],
		},

		SwitchDocumentDirection: {
		child: {
		moduleURI: "resource:///actors/SwitchDocumentDirectionChild.jsm",
		@@ -2005,7 +1981,6 @@ BrowserGlue.prototype = {
		() => NewTabUtils.uninit(),
		() => Normandy.uninit(),
		() => RFPHelper.uninit(),
		() => ASRouterNewTabHook.destroy(),
		() => UpdateListener.reset(),
		];

		@@ -2716,12 +2691,6 @@ BrowserGlue.prototype = {
		},
		},

		{
		task: () => {
		ASRouterNewTabHook.createInstance(ASRouterDefaultConfig());
		},
		},

		{
		condition: AppConstants.MOZ_UPDATE_AGENT,
		task: () => {