Bug 1700984 - Remove excessive separators in Page context menu r=jaws

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

browser/base/content/browser-context.inc

@@ -262,8 +262,6 @@
       <menuitem id="context-pocket"
                 data-l10n-id="main-context-menu-save-to-pocket"
                 oncommand="Pocket.savePage(gContextMenu.browser, gContextMenu.browser.currentURI.spec, gContextMenu.browser.contentTitle);"/>
-      <menuseparator id="context-sep-sendpagetodevice" class="sync-ui-item"
-                     hidden="true"/>
       <menu id="context-sendpagetodevice"
             class="sync-ui-item"
             data-l10n-id="main-context-menu-send-to-device"
@@ -274,14 +272,14 @@
       <menu id="fill-login" hidden="true">
         <menupopup id="fill-login-popup" />
       </menu>
-     <menuitem id="fill-login-generated-password"
-               data-l10n-id="main-context-menu-suggest-strong-password"
-               hidden="true"
-               oncommand="gContextMenu.useGeneratedPassword();"/>
-     <menuitem id="manage-saved-logins"
-               data-l10n-id="main-context-menu-manage-logins2"
-               hidden = "true"
-               oncommand="gContextMenu.openPasswordManager();"/>
+      <menuitem id="fill-login-generated-password"
+                data-l10n-id="main-context-menu-suggest-strong-password"
+                hidden="true"
+                oncommand="gContextMenu.useGeneratedPassword();"/>
+      <menuitem id="manage-saved-logins"
+                data-l10n-id="main-context-menu-manage-logins2"
+                hidden="true"
+                oncommand="gContextMenu.openPasswordManager();"/>
       <menuseparator id="passwordmgr-items-separator"/>
       <menuitem id="context-undo"
                 data-l10n-id="text-action-undo"

browser/base/content/nsContextMenu.js

@@ -1025,9 +1025,10 @@ class nsContextMenu {
         "disabled",
         !enableGeneration
       );
-      this.showItem(
+      this.setItemAttr(
         "passwordmgr-items-separator",
-        showUseSavedLogin || showGenerate || showManage
+        "ensureHidden",
+        showUseSavedLogin || showGenerate || showManage ? null : true
       );
     }
   }

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

@@ -161,8 +161,6 @@ add_task(async function test_plaintext() {
     "context-savepage",
     true,
     ...(hasPocket ? ["context-pocket", true] : []),
-    "---",
-    null,
     "context-selectall",
     true,
     "---",
@@ -649,8 +647,6 @@ add_task(async function test_iframe() {
     "context-savepage",
     true,
     ...(hasPocket ? ["context-pocket", true] : []),
-    "---",
-    null,
     "context-selectall",
     true,
     "---",
@@ -978,8 +974,6 @@ add_task(async function test_pdf_viewer_in_iframe() {
       "context-savepage",
       true,
       ...(hasPocket ? ["context-pocket", true] : []),
-      "---",
-      null,
       "context-selectall",
       true,
       "---",
@@ -1233,8 +1227,6 @@ add_task(async function test_pagemenu() {
     "context-savepage",
     true,
     ...(hasPocket ? ["context-pocket", true] : []),
-    "---",
-    null,
     "context-selectall",
     true,
     "---",
@@ -1280,8 +1272,6 @@ add_task(async function test_dom_full_screen() {
     "context-savepage",
     true,
     ...(hasPocket ? ["context-pocket", true] : []),
-    "---",
-    null,
     "context-selectall",
     true,
     "---",
@@ -1347,8 +1337,6 @@ add_task(async function test_pagemenu2() {
       "context-savepage",
       true,
       ...(hasPocket ? ["context-pocket", true] : []),
-      "---",
-      null,
       "context-selectall",
       true,
       "---",
@@ -1636,8 +1624,6 @@ add_task(async function test_srcdoc() {
     "context-savepage",
     true,
     ...(hasPocket ? ["context-pocket", true] : []),
-    "---",
-    null,
     "context-selectall",
     true,
     "---",
@@ -1873,8 +1859,6 @@ add_task(async function test_background_image() {
     "context-savepage",
     true,
     ...(hasPocket ? ["context-pocket", true] : []),
-    "---",
-    null,
     "context-selectall",
     true,
     "---",

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

@@ -227,8 +227,6 @@ add_task(
           "context-savepage",
           true,
           ...(hasPocket ? ["context-pocket", true] : []),
-          "---",
-          null,
           "context-selectall",
           null,
           "---",