Fix role=switch type and description.

Bug: 1019947
Change-Id: Ie19d410e0fc5e07b1ebc1fcdf3d94a94dfce9a6d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1888188Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Alice Boxhall <aboxhall@chromium.org>
Reviewed-by: Kurt Catti-Schmidt <kschmi@microsoft.com>
Commit-Queue: Jacques Newman <janewman@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#711592}

content/browser/accessibility/browser_accessibility.cc

@@ -1957,6 +1957,9 @@ base::string16 BrowserAccessibility::GetLocalizedStringForRoleDescription()
     case ax::mojom::Role::kStrong:
       return content_client->GetLocalizedString(IDS_AX_ROLE_STRONG);
 
+    case ax::mojom::Role::kSwitch:
+      return content_client->GetLocalizedString(IDS_AX_ROLE_SWITCH);
+
     case ax::mojom::Role::kTextField: {
       std::string input_type;
       if (data.GetStringAttribute(ax::mojom::StringAttribute::kInputType,

content/test/data/accessibility/html/action-verbs-expected-uia-win.txt

@@ -11,7 +11,7 @@ document Name='Action verbs'
 ++checkbox Toggle.ToggleState='Off'
 ++checkbox Toggle.ToggleState='On'
 ++radio SelectionItem.IsSelected=false
-++checkbox Name='ARIA Switch' Toggle.ToggleState='Off'
+++switch Name='ARIA Switch' Toggle.ToggleState='Off'
 ++group
 ++++button Name='Summary' ExpandCollapse.ExpandCollapseState='Collapsed'
 ++++++description Name='Summary'

ui/accessibility/platform/ax_platform_node_win.cc

@@ -5796,7 +5796,7 @@ base::string16 AXPlatformNodeWin::UIAAriaRole() {
       return L"strong";
 
     case ax::mojom::Role::kSwitch:
-      return L"checkbox";
+      return L"switch";
 
     case ax::mojom::Role::kRubyAnnotation:
     case ax::mojom::Role::kListMarker:
@@ -6447,7 +6447,7 @@ LONG AXPlatformNodeWin::ComputeUIAControlType() {  // NOLINT(runtime/int)
       return UIA_SpinnerControlTypeId;
 
     case ax::mojom::Role::kSwitch:
-      return UIA_CheckBoxControlTypeId;
+      return UIA_ButtonControlTypeId;
 
     case ax::mojom::Role::kRubyAnnotation:
     case ax::mojom::Role::kListMarker: