Bug 1636831 - change the order of inspect element and inspect accessibility properties context menu items to preserve the former as the last item in the menu. r=nchevobbe

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

browser/base/content/browser-context.inc

@@ -376,14 +376,14 @@
                 data-l10n-id="main-context-menu-bidi-switch-page"
                 oncommand="gContextMenu.switchPageDirection();"/>
       <menuseparator id="inspect-separator" hidden="true"/>
-      <menuitem id="context-inspect"
-                hidden="true"
-                data-l10n-id="main-context-menu-inspect-element"
-                oncommand="gContextMenu.inspectNode();"/>
       <menuitem id="context-inspect-a11y"
                 hidden="true"
                 data-l10n-id="main-context-menu-inspect-a11y-properties"
                 oncommand="gContextMenu.inspectA11Y();"/>
+      <menuitem id="context-inspect"
+                hidden="true"
+                data-l10n-id="main-context-menu-inspect-element"
+                oncommand="gContextMenu.inspectNode();"/>
       <menuseparator id="context-media-eme-separator" hidden="true"/>
       <menuitem id="context-media-eme-learnmore"
                 class="menuitem-iconic"

browser/base/content/test/contextMenu/contextmenu_common.js

@@ -429,20 +429,20 @@ async function test_contextmenu(selector, menuItems, options = {}) {
 
   if (menuItems) {
     if (Services.prefs.getBoolPref("devtools.inspector.enabled", true)) {
-      let inspectItems = ["---", null, "context-inspect", true];
-      menuItems = menuItems.concat(inspectItems);
-    }
+      const inspectItems = ["---", null];
+      if (
+        Services.prefs.getBoolPref("devtools.accessibility.enabled", true) &&
+        (Services.appinfo.accessibilityEnabled ||
+          Services.prefs.getBoolPref(
+            "devtools.accessibility.auto-init.enabled",
+            false
+          ))
+      ) {
+        inspectItems.push("context-inspect-a11y", true);
+      }
 
-    if (
-      Services.prefs.getBoolPref("devtools.accessibility.enabled", true) &&
-      (Services.appinfo.accessibilityEnabled ||
-        Services.prefs.getBoolPref(
-          "devtools.accessibility.auto-init.enabled",
-          false
-        ))
-    ) {
-      let inspectA11YItems = ["context-inspect-a11y", true];
-      menuItems = menuItems.concat(inspectA11YItems);
+      inspectItems.push("context-inspect", true);
+      menuItems = menuItems.concat(inspectItems);
     }
 
     if (