Fix regression in context menu announcements with NVDA

Use kMenu for views submenus, so that NVDA announcements are correct.
Fixes regression from CL:2369252

Test: JAWS/NVDA with main menu, context menus, views combo boxes
Bug: 1122424
Change-Id: I2ccc28c30dd225c0ec53f89f8547810d2f2d7dbd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2381258Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Auto-Submit: Aaron Leventhal <aleventhal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802799}

chrome/browser/ui/views/menu_interactive_uitest.cc

@@ -84,7 +84,7 @@ class MenuControllerUITest : public InProcessBrowserTest {
     ui::AXNodeData menu_node_data;
     menu_item->GetSubmenu()->GetViewAccessibility().GetAccessibleNodeData(
         &menu_node_data);
-    EXPECT_EQ(menu_node_data.role, ax::mojom::Role::kMenuListPopup);
+    EXPECT_EQ(menu_node_data.role, ax::mojom::Role::kMenu);
     menu_runner_->Cancel();
     RunPendingMessages();
   }

ui/views/controls/menu/submenu_view.cc

@@ -202,7 +202,7 @@ void SubmenuView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   // the orientation.
   if (parent_menu_item_)
     parent_menu_item_->GetAccessibleNodeData(node_data);
-  node_data->role = ax::mojom::Role::kMenuListPopup;
+  node_data->role = ax::mojom::Role::kMenu;
   // Menus in Chrome are always traversed in a vertical direction.
   node_data->AddState(ax::mojom::State::kVertical);
 }