Use consistent role for options in a select size=1

Sometimes the menuitem role was incorrectly exposed for the role of
<option> elements in a <select size=1> depending on which ancestors
were ignored. These elements should always be exposed as listitems.

The code that does this was intended to be removed as part of a
previous refactoring. This removes it now.

to screen readers as menuitems instead of listitems (Windows only)

AX-RelNotes: in rare cases, select drop down options were reported
Bug: 1114273
Change-Id: I618a883912cca5809661d919bbb48cfdc355e3d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2369252
Commit-Queue: Aaron Leventhal <aleventhal@chromium.org>
Commit-Queue: Nektarios Paisios <nektar@chromium.org>
Auto-Submit: Aaron Leventhal <aleventhal@chromium.org>
Reviewed-by: Nektarios Paisios <nektar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#801432}

content/test/data/accessibility/html/modal-dialog-opened-expected-uia-win.txt

@@ -3,4 +3,4 @@ Document
 ++++Text Name='The dialog subtree should be the only text content in the accessibility tree. '
 ++++Hyperlink Name='Link inside the dialog.'
 ++++++Text Name='Link inside the dialog.' IsControlElement=false
-++Menu IsControlElement=false Selection.CanSelectMultiple=false Selection.IsSelectionRequired=false
+++List IsControlElement=false Selection.CanSelectMultiple=false Selection.IsSelectionRequired=false
\ No newline at end of file

content/test/data/accessibility/html/modal-dialog-opened-expected-win.txt

@@ -3,4 +3,4 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
 ++++ROLE_SYSTEM_STATICTEXT name='The dialog subtree should be the only text content in the accessibility tree. '
 ++++ROLE_SYSTEM_LINK name='Link inside the dialog.' FOCUSABLE
 ++++++ROLE_SYSTEM_STATICTEXT name='Link inside the dialog.'
-++ROLE_SYSTEM_MENUPOPUP INVISIBLE
+++ROLE_SYSTEM_LIST INVISIBLE
\ No newline at end of file

content/test/data/accessibility/html/modal-dialog-stack-expected-uia-win.txt

 Document
-++Menu IsControlElement=false Selection.CanSelectMultiple=false Selection.IsSelectionRequired=false
+++List IsControlElement=false Selection.CanSelectMultiple=false Selection.IsSelectionRequired=false
 ++Pane IsControlElement=false Window.IsModal=true
 ++++Text Name='This is the now active dialog. Of course it should be in the tree. '
 ++++Button Name='This is in the active dialog and should be in the tree.'
\ No newline at end of file

content/test/data/accessibility/html/modal-dialog-stack-expected-win.txt

 ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
-++ROLE_SYSTEM_MENUPOPUP INVISIBLE
+++ROLE_SYSTEM_LIST INVISIBLE
 ++ROLE_SYSTEM_DIALOG IA2_STATE_MODAL
 ++++ROLE_SYSTEM_STATICTEXT name='This is the now active dialog. Of course it should be in the tree. '
 ++++ROLE_SYSTEM_PUSHBUTTON name='This is in the active dialog and should be in the tree.' FOCUSABLE
\ No newline at end of file

ui/accessibility/platform/ax_platform_node_win.cc

@@ -5321,14 +5321,10 @@ int AXPlatformNodeWin::MSAARole() {
       return ROLE_SYSTEM_MENUITEM;
 
     case ax::mojom::Role::kMenuListPopup:
-      if (IsAncestorComboBox())
-        return ROLE_SYSTEM_LIST;
-      return ROLE_SYSTEM_MENUPOPUP;
+      return ROLE_SYSTEM_LIST;
 
     case ax::mojom::Role::kMenuListOption:
-      if (IsAncestorComboBox())
-        return ROLE_SYSTEM_LISTITEM;
-      return ROLE_SYSTEM_MENUITEM;
+      return ROLE_SYSTEM_LISTITEM;
 
     case ax::mojom::Role::kMeter:
       return ROLE_SYSTEM_PROGRESSBAR;
@@ -6152,14 +6148,10 @@ base::string16 AXPlatformNodeWin::UIAAriaRole() {
       return L"menuitemradio";
 
     case ax::mojom::Role::kMenuListPopup:
-      if (IsAncestorComboBox())
-        return L"list";
-      return L"menu";
+      return L"list";
 
     case ax::mojom::Role::kMenuListOption:
-      if (IsAncestorComboBox())
-        return L"listitem";
-      return L"menuitem";
+      return L"listitem";
 
     case ax::mojom::Role::kMeter:
       return L"progressbar";
@@ -6818,14 +6810,10 @@ LONG AXPlatformNodeWin::ComputeUIAControlType() {  // NOLINT(runtime/int)
       return UIA_RadioButtonControlTypeId;
 
     case ax::mojom::Role::kMenuListPopup:
-      if (IsAncestorComboBox())
-        return UIA_ListControlTypeId;
-      return UIA_MenuControlTypeId;
+      return UIA_ListControlTypeId;
 
     case ax::mojom::Role::kMenuListOption:
-      if (IsAncestorComboBox())
-        return UIA_ListItemControlTypeId;
-      return UIA_MenuItemControlTypeId;
+      return UIA_ListItemControlTypeId;
 
     case ax::mojom::Role::kMeter:
       return UIA_ProgressBarControlTypeId;
@@ -7808,18 +7796,6 @@ HRESULT AXPlatformNodeWin::AllocateComArrayFromVector(
   return S_OK;
 }
 
-// TODO(dmazzoni): Remove this function once combo box refactoring is
-// complete.
-bool AXPlatformNodeWin::IsAncestorComboBox() {
-  auto* parent =
-      static_cast<AXPlatformNodeWin*>(FromNativeViewAccessible(GetParent()));
-  if (!parent)
-    return false;
-  if (parent->MSAARole() == ROLE_SYSTEM_COMBOBOX)
-    return true;
-  return parent->IsAncestorComboBox();
-}
-
 bool AXPlatformNodeWin::IsPlaceholderText() const {
   if (GetData().role != ax::mojom::Role::kStaticText)
     return false;