Backed out changeset d98b62477b98 (bug 1904441) for causing bc failures & assertion failures @ browser_messagepreview_receivemessage.js / nsContentSecurityUtils.cpp CLOSED TREE

Author: Sandor Molnar

browser/components/asrouter/modules/ASRouter.sys.mjs

@@ -2115,7 +2115,7 @@ export class _ASRouter {
       privateBrowserOpener.browsingContext.currentWindowGlobal
         .getActor("AboutPrivateBrowsing")
         .sendAsyncMessage("ShowDevToolsMessage", msg);
-    }, 200);
+    }, 100);
 
     return privateBrowserOpener;
   }

browser/components/messagepreview/actors/AboutMessagePreviewParent.sys.mjs

@@ -12,7 +12,6 @@ ChromeUtils.defineESModuleGetters(lazy, {
   AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
   BookmarksBarButton: "resource:///modules/asrouter/BookmarksBarButton.sys.mjs",
   CFRPageActions: "resource:///modules/asrouter/CFRPageActions.sys.mjs",
-  CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
   FeatureCalloutBroker:
     "resource:///modules/asrouter/FeatureCalloutBroker.sys.mjs",
   InfoBar: "resource:///modules/asrouter/InfoBar.sys.mjs",
@@ -60,13 +59,7 @@ export class AboutMessagePreviewParent extends JSWindowActorParent {
   }
 
   showBookmarksBarButton(message, browser) {
-    //ensure the bookmarks bar is open
-    lazy.CustomizableUI.setToolbarVisibility(
-      lazy.CustomizableUI.AREA_BOOKMARKS,
-      true
-    );
-    //and then send the message
-    lazy.BookmarksBarButton.showBookmarksBarButton(browser, message);
+    lazy.BookmarksBarButton.showBookmarksBarButton(message, browser);
   }
 
   showCFR(message, browser) {
@@ -120,18 +113,7 @@ export class AboutMessagePreviewParent extends JSWindowActorParent {
     }
   }
 
-  /**
-   * Chooses the appropriate messaging system function for showing
-   * the message, based on the template passed in data
-   *
-   * @param {string} data - a string containing the message JSON
-   * @param {boolean} validationEnabled - whether or not to run
-   * schema validation on the message JSON. Should be false in
-   * tests so that we don't have to pass real messages or call
-   * the validation function.
-   */
-
-  async showMessage(data, validationEnabled = true) {
+  async showMessage(data) {
     let message;
     try {
       message = JSON.parse(data);
@@ -140,17 +122,16 @@ export class AboutMessagePreviewParent extends JSWindowActorParent {
       return;
     }
 
-    if (validationEnabled) {
-      const schema = await fetch(
-        "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json",
-        { credentials: "omit" }
-      ).then(rsp => rsp.json());
-      const result = JsonSchema.validate(message, schema);
-      if (!result.valid) {
-        console.error(
-          `Invalid message: ${JSON.stringify(result.errors, undefined, 2)}`
-        );
-      }
+    const schema = await fetch(
+      "chrome://browser/content/asrouter/schemas/MessagingExperiment.schema.json",
+      { credentials: "omit" }
+    ).then(rsp => rsp.json());
+
+    const result = JsonSchema.validate(message, schema);
+    if (!result.valid) {
+      console.error(
+        `Invalid message: ${JSON.stringify(result.errors, undefined, 2)}`
+      );
     }
 
     const browser =
@@ -180,12 +161,11 @@ export class AboutMessagePreviewParent extends JSWindowActorParent {
   }
 
   receiveMessage(message) {
-    // validationEnabled is used for testing
-    const { name, data, validationEnabled } = message;
+    const { name, data } = message;
 
     switch (name) {
       case "MessagePreview:SHOW_MESSAGE":
-        this.showMessage(data, validationEnabled);
+        this.showMessage(data);
         return;
       case "MessagePreview:CHANGE_THEME": {
         const theme = data.isDark ? SWITCH_THEMES.LIGHT : SWITCH_THEMES.DARK;

browser/components/messagepreview/moz.build

@@ -11,10 +11,6 @@ FINAL_LIBRARY = "browsercomps"
 with Files("**"):
     BUG_COMPONENT = ("Firefox", "Messaging System")
 
-BROWSER_CHROME_MANIFESTS += [
-    "tests/browser/browser.toml",
-]
-
 FINAL_TARGET_FILES.actors += [
     "actors/AboutMessagePreviewChild.sys.mjs",
     "actors/AboutMessagePreviewParent.sys.mjs",