Menuitem in group needs name from contents

Fixes regression from CL:2142611 where a menuitem inside of a
group no longer gets an accessible name.

This was due to moving kMenuButton inside the NameFromContents()
switch, such that it would no longer get a name from contents.
Currently, a role=menuitem inside a role=group gets remapped to
kMenuButton via AXObject::RemapAriaRoleDueToParent().

The purpose of remapping menuitem inside of a group to kMenuButton is
to expose it as AXMenuButton instead of AXMenuItem on OS, per CORE-AAM.
This remapping may be removed in the future, and is an open issue
in CORE-AAM. See https://github.com/w3c/core-aam/issues/78

Bug: 1114712
Change-Id: Iae23b2351e72486e1cf3bf4b96ce1ff283e4ad97
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2353019Reviewed-by: Nektarios Paisios <nektar@chromium.org>
Commit-Queue: Nektarios Paisios <nektar@chromium.org>
Auto-Submit: Aaron Leventhal <aleventhal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#797667}

third_party/blink/renderer/modules/accessibility/ax_object.cc

@@ -3968,6 +3968,7 @@ bool AXObject::NameFromContents(bool recursive) const {
     case ax::mojom::blink::Role::kLineBreak:
     case ax::mojom::blink::Role::kLink:
     case ax::mojom::blink::Role::kListBoxOption:
+    case ax::mojom::blink::Role::kMenuButton:
     case ax::mojom::blink::Role::kMenuItem:
     case ax::mojom::blink::Role::kMenuItemCheckBox:
     case ax::mojom::blink::Role::kMenuItemRadio:
@@ -4072,8 +4073,6 @@ bool AXObject::NameFromContents(bool recursive) const {
     case ax::mojom::blink::Role::kMenuListPopup:
     case ax::mojom::blink::Role::kMenu:
     case ax::mojom::blink::Role::kMenuBar:
-    case ax::mojom::blink::Role::kMenuButton:  // Only value from content, not
-                                               // name.
     case ax::mojom::blink::Role::kMeter:
     case ax::mojom::blink::Role::kNavigation:
     case ax::mojom::blink::Role::kNote:

third_party/blink/web_tests/accessibility/computed-name-expected.txt

@@ -60,6 +60,8 @@ PASS name is "menu name"
 PASS name is "menubar name"
 PASS name is "menuitem name"
 PASS name is "menuitem name"
+PASS name is "group name"
+PASS name is "menuitem name"
 PASS name is "menuitemcheckbox name"
 PASS name is "menuitemcheckbox name"
 PASS name is "menuitemradio name"

third_party/blink/web_tests/accessibility/computed-name.html

@@ -118,6 +118,9 @@
 
       <div role="menuitem">menuitem name</div>
       <div role="menuitem" aria-label="menuitem name">This is a menuitem</div>
+      <div role="group" aria-label="group name">
+        <div role="menuitem">menuitem name</div>
+      </div>
       <menu type="popup">
         <menuitem command="doSomething" data-role="menuitem" aria-label="implicit menuitem name" data-knownFailure>This is a menuitem</menuitem>
       </menu>