Clean up accessibility enums for use in Chromium.

Source/testing/runner/AccessibilityUIElementChromium.cpp

Index: Source/testing/runner/AccessibilityUIElementChromium.cpp
diff --git a/Source/testing/runner/AccessibilityUIElementChromium.cpp b/Source/testing/runner/AccessibilityUIElementChromium.cpp
index 62b4ca81ac46ac065f8ee6fed02921c05d9ef840..e48d75c71f9b12f4821fb8d9766f186ba26a7ef3 100644
--- a/Source/testing/runner/AccessibilityUIElementChromium.cpp
+++ b/Source/testing/runner/AccessibilityUIElementChromium.cpp
@@ -46,226 +46,230 @@ namespace {
 
 // Map role value to string, matching Safari/Mac platform implementation to
 // avoid rebaselining layout tests.
-string roleToString(WebAccessibilityRole role)
+string roleToString(WebAXRole role)
 {
     string result = "AXRole: AX";
     switch (role) {
-    case WebAccessibilityRoleButton:
-        return result.append("Button");
-    case WebAccessibilityRoleRadioButton:
-        return result.append("RadioButton");
-    case WebAccessibilityRoleCheckBox:
-        return result.append("CheckBox");
-    case WebAccessibilityRoleSlider:
-        return result.append("Slider");
-    case WebAccessibilityRoleTabGroup:
-        return result.append("TabGroup");
-    case WebAccessibilityRoleTextField:
-        return result.append("TextField");
-    case WebAccessibilityRoleStaticText:
-        return result.append("StaticText");
-    case WebAccessibilityRoleTextArea:
-        return result.append("TextArea");
-    case WebAccessibilityRoleScrollArea:
-        return result.append("ScrollArea");
-    case WebAccessibilityRolePopUpButton:
-        return result.append("PopUpButton");
-    case WebAccessibilityRoleMenuButton:
-        return result.append("MenuButton");
-    case WebAccessibilityRoleTable:
-        return result.append("Table");
-    case WebAccessibilityRoleApplication:
+    case WebAXRoleAlertDialog:
+        return result.append("AlertDialog");
+    case WebAXRoleAlert:
+        return result.append("Alert");
+    case WebAXRoleAnnotation:
+        return result.append("Annotation");
+    case WebAXRoleApplication:
         return result.append("Application");
-    case WebAccessibilityRoleGroup:
-        return result.append("Group");
-    case WebAccessibilityRoleRadioGroup:
-        return result.append("RadioGroup");
-    case WebAccessibilityRoleList:
-        return result.append("List");
-    case WebAccessibilityRoleScrollBar:
-        return result.append("ScrollBar");
-    case WebAccessibilityRoleValueIndicator:
-        return result.append("ValueIndicator");
-    case WebAccessibilityRoleImage:
-        return result.append("Image");
-    case WebAccessibilityRoleMenuBar:
-        return result.append("MenuBar");
-    case WebAccessibilityRoleMenu:
-        return result.append("Menu");
-    case WebAccessibilityRoleMenuItem:
-        return result.append("MenuItem");
-    case WebAccessibilityRoleColumn:
-        return result.append("Column");
-    case WebAccessibilityRoleRow:
-        return result.append("Row");
-    case WebAccessibilityRoleToolbar:
-        return result.append("Toolbar");
-    case WebAccessibilityRoleBusyIndicator:
-        return result.append("BusyIndicator");
-    case WebAccessibilityRoleProgressIndicator:
-        return result.append("ProgressIndicator");
-    case WebAccessibilityRoleWindow:
-        return result.append("Window");
-    case WebAccessibilityRoleDrawer:
-        return result.append("Drawer");
-    case WebAccessibilityRoleSystemWide:
-        return result.append("SystemWide");
-    case WebAccessibilityRoleOutline:
-        return result.append("Outline");
-    case WebAccessibilityRoleIncrementor:
-        return result.append("Incrementor");
-    case WebAccessibilityRoleBrowser:
+    case WebAXRoleArticle:
+        return result.append("Article");
+    case WebAXRoleBanner:
+        return result.append("Banner");
+    case WebAXRoleBrowser:
         return result.append("Browser");
-    case WebAccessibilityRoleComboBox:
-        return result.append("ComboBox");
-    case WebAccessibilityRoleSplitGroup:
-        return result.append("SplitGroup");
-    case WebAccessibilityRoleSplitter:
-        return result.append("Splitter");
-    case WebAccessibilityRoleColorWell:
-        return result.append("ColorWell");
-    case WebAccessibilityRoleGrowArea:
-        return result.append("GrowArea");
-    case WebAccessibilityRoleSheet:
-        return result.append("Sheet");
-    case WebAccessibilityRoleHelpTag:
-        return result.append("HelpTag");
-    case WebAccessibilityRoleMatte:
-        return result.append("Matte");
-    case WebAccessibilityRoleRuler:
-        return result.append("Ruler");
-    case WebAccessibilityRoleRulerMarker:
-        return result.append("RulerMarker");
-    case WebAccessibilityRoleLink:
-        return result.append("Link");
-    case WebAccessibilityRoleDisclosureTriangle:
-        return result.append("DisclosureTriangle");
-    case WebAccessibilityRoleGrid:
-        return result.append("Grid");
-    case WebAccessibilityRoleCell:
+    case WebAXRoleBusyIndicator:
+        return result.append("BusyIndicator");
+    case WebAXRoleButton:
+        return result.append("Button");
+    case WebAXRoleCanvas:
+        return result.append("Canvas");
+    case WebAXRoleCell:
         return result.append("Cell");
-    case WebAccessibilityRoleColumnHeader:
+    case WebAXRoleCheckBox:
+        return result.append("CheckBox");
+    case WebAXRoleColorWell:
+        return result.append("ColorWell");
+    case WebAXRoleColumnHeader:
         return result.append("ColumnHeader");
-    case WebAccessibilityRoleRowHeader:
-        return result.append("RowHeader");
-    case WebAccessibilityRoleWebCoreLink:
-        // Maps to Link role.
-        return result.append("Link");
-    case WebAccessibilityRoleImageMapLink:
-        return result.append("ImageMapLink");
-    case WebAccessibilityRoleImageMap:
-        return result.append("ImageMap");
-    case WebAccessibilityRoleListMarker:
-        return result.append("ListMarker");
-    case WebAccessibilityRoleWebArea:
-        return result.append("WebArea");
-    case WebAccessibilityRoleHeading:
-        return result.append("Heading");
-    case WebAccessibilityRoleListBox:
-        return result.append("ListBox");
-    case WebAccessibilityRoleListBoxOption:
-        return result.append("ListBoxOption");
-    case WebAccessibilityRoleTableHeaderContainer:
-        return result.append("TableHeaderContainer");
-    case WebAccessibilityRoleDefinition:
+    case WebAXRoleColumn:
+        return result.append("Column");
+    case WebAXRoleComboBox:
+        return result.append("ComboBox");
+    case WebAXRoleComplementary:
+        return result.append("Complementary");
+    case WebAXRoleContentInfo:
+        return result.append("ContentInfo");
+    case WebAXRoleDefinition:
         return result.append("Definition");
-    case WebAccessibilityRoleDescriptionListTerm:
-        return result.append("DescriptionListTerm");
-    case WebAccessibilityRoleDescriptionListDetail:
+    case WebAXRoleDescriptionListDetail:
         return result.append("DescriptionListDetail");
-    case WebAccessibilityRoleAnnotation:
-        return result.append("Annotation");
-    case WebAccessibilityRoleSliderThumb:
-        return result.append("SliderThumb");
-    case WebAccessibilityRoleLandmarkApplication:
-        return result.append("LandmarkApplication");
-    case WebAccessibilityRoleLandmarkBanner:
-        return result.append("LandmarkBanner");
-    case WebAccessibilityRoleLandmarkComplementary:
-        return result.append("LandmarkComplementary");
-    case WebAccessibilityRoleLandmarkContentInfo:
-        return result.append("LandmarkContentInfo");
-    case WebAccessibilityRoleLandmarkMain:
-        return result.append("LandmarkMain");
-    case WebAccessibilityRoleLandmarkNavigation:
-        return result.append("LandmarkNavigation");
-    case WebAccessibilityRoleLandmarkSearch:
-        return result.append("LandmarkSearch");
-    case WebAccessibilityRoleApplicationLog:
-        return result.append("ApplicationLog");
-    case WebAccessibilityRoleApplicationMarquee:
-        return result.append("ApplicationMarquee");
-    case WebAccessibilityRoleApplicationStatus:
-        return result.append("ApplicationStatus");
-    case WebAccessibilityRoleApplicationTimer:
-        return result.append("ApplicationTimer");
-    case WebAccessibilityRoleDocument:
-        return result.append("Document");
-    case WebAccessibilityRoleDocumentArticle:
-        return result.append("DocumentArticle");
-    case WebAccessibilityRoleDocumentNote:
-        return result.append("DocumentNote");
-    case WebAccessibilityRoleDocumentRegion:
-        return result.append("DocumentRegion");
-    case WebAccessibilityRoleUserInterfaceTooltip:
-        return result.append("UserInterfaceTooltip");
-    case WebAccessibilityRoleToggleButton:
-        return result.append("ToggleButton");
-    case WebAccessibilityRoleCanvas:
-        return result.append("Canvas");
-    case WebAccessibilityRoleParagraph:
-        return result.append("Paragraph");
-    case WebAccessibilityRoleDiv:
-        return result.append("Div");
-    case WebAccessibilityRoleLabel:
-        return result.append("Label");
-    case WebAccessibilityRoleForm:
-        return result.append("Form");
-    case WebAccessibilityRoleHorizontalRule:
-        return result.append("HorizontalRule");
-    case WebAccessibilityRoleLegend:
-        return result.append("Legend");
-    case WebAccessibilityRoleApplicationAlert:
-        return result.append("Alert");
-    case WebAccessibilityRoleApplicationAlertDialog:
-        return result.append("AlertDialog");
-    case WebAccessibilityRoleApplicationDialog:
-        return result.append("ApplicationDialog");
-    case WebAccessibilityRoleDirectory:
+    case WebAXRoleDescriptionListTerm:
+        return result.append("DescriptionListTerm");
+    case WebAXRoleDialog:
+        return result.append("Dialog");
+    case WebAXRoleDirectory:
         return result.append("Directory");
-    case WebAccessibilityRoleDocumentMath:
-        return result.append("Math");
-    case WebAccessibilityRoleEditableText:
+    case WebAXRoleDisclosureTriangle:
+        return result.append("DisclosureTriangle");
+    case WebAXRoleDiv:
+        return result.append("Div");
+    case WebAXRoleDocument:
+        return result.append("Document");
+    case WebAXRoleDrawer:
+        return result.append("Drawer");
+    case WebAXRoleEditableText:
         return result.append("EditableText");
-    case WebAccessibilityRoleFooter:
+    case WebAXRoleFooter:
         return result.append("Footer");
-    case WebAccessibilityRoleIgnored:
+    case WebAXRoleForm:
+        return result.append("Form");
+    case WebAXRoleGrid:
+        return result.append("Grid");
+    case WebAXRoleGroup:
+        return result.append("Group");
+    case WebAXRoleGrowArea:
+        return result.append("GrowArea");
+    case WebAXRoleHeading:
+        return result.append("Heading");
+    case WebAXRoleHelpTag:
+        return result.append("HelpTag");
+    case WebAXRoleHorizontalRule:
+        return result.append("HorizontalRule");
+    case WebAXRoleIgnored:
         return result.append("Ignored");
-    case WebAccessibilityRoleListItem:
+    case WebAXRoleImageMapLink:
+        return result.append("ImageMapLink");
+    case WebAXRoleImageMap:
+        return result.append("ImageMap");
+    case WebAXRoleImage:
+        return result.append("Image");
+    case WebAXRoleIncrementor:
+        return result.append("Incrementor");
+    case WebAXRoleLabel:
+        return result.append("Label");
+    case WebAXRoleLegend:
+        return result.append("Legend");
+    case WebAXRoleLink:
+        return result.append("Link");
+    case WebAXRoleListBoxOption:
+        return result.append("ListBoxOption");
+    case WebAXRoleListBox:
+        return result.append("ListBox");
+    case WebAXRoleListItem:
         return result.append("ListItem");
-    case WebAccessibilityRoleMenuListPopup:
-        return result.append("MenuListPopup");
-    case WebAccessibilityRoleMenuListOption:
+    case WebAXRoleListMarker:
+        return result.append("ListMarker");
+    case WebAXRoleList:
+        return result.append("List");
+    case WebAXRoleLog:
+        return result.append("Log");
+    case WebAXRoleMain:
+        return result.append("Main");
+    case WebAXRoleMarquee:
+        return result.append("Marquee");
+    case WebAXRoleMathElement:
+        return result.append("MathElement");
+    case WebAXRoleMath:
+        return result.append("Math");
+    case WebAXRoleMatte:
+        return result.append("Matte");
+    case WebAXRoleMenuBar:
+        return result.append("MenuBar");
+    case WebAXRoleMenuButton:
+        return result.append("MenuButton");
+    case WebAXRoleMenuItem:
+        return result.append("MenuItem");
+    case WebAXRoleMenuListOption:
         return result.append("MenuListOption");
-    case WebAccessibilityRolePresentational:
+    case WebAXRoleMenuListPopup:
+        return result.append("MenuListPopup");
+    case WebAXRoleMenu:
+        return result.append("Menu");
+    case WebAXRoleNavigation:
+        return result.append("Navigation");
+    case WebAXRoleNote:
+        return result.append("Note");
+    case WebAXRoleOutline:
+        return result.append("Outline");
+    case WebAXRoleParagraph:
+        return result.append("Paragraph");
+    case WebAXRolePopUpButton:
+        return result.append("PopUpButton");
+    case WebAXRolePresentational:
         return result.append("Presentational");
-    case WebAccessibilityRoleSpinButton:
-        return result.append("SpinButton");
-    case WebAccessibilityRoleSpinButtonPart:
+    case WebAXRoleProgressIndicator:
+        return result.append("ProgressIndicator");
+    case WebAXRoleRadioButton:
+        return result.append("RadioButton");
+    case WebAXRoleRadioGroup:
+        return result.append("RadioGroup");
+    case WebAXRoleRegion:
+        return result.append("Region");
+    case WebAXRoleRootWebArea:
+        return result.append("RootWebArea");
+    case WebAXRoleRowHeader:
+        return result.append("RowHeader");
+    case WebAXRoleRow:
+        return result.append("Row");
+    case WebAXRoleRulerMarker:
+        return result.append("RulerMarker");
+    case WebAXRoleRuler:
+        return result.append("Ruler");
+    case WebAXRoleSVGRoot:
+        return result.append("SVGRoot");
+    case WebAXRoleScrollArea:
+        return result.append("ScrollArea");
+    case WebAXRoleScrollBar:
+        return result.append("ScrollBar");
+    case WebAXRoleSeamlessWebArea:
+        return result.append("SeamlessWebArea");
+    case WebAXRoleSearch:
+        return result.append("Search");
+    case WebAXRoleSheet:
+        return result.append("Sheet");
+    case WebAXRoleSlider:
+        return result.append("Slider");
+    case WebAXRoleSliderThumb:
+        return result.append("SliderThumb");
+    case WebAXRoleSpinButtonPart:
         return result.append("SpinButtonPart");
-    case WebAccessibilityRoleTabList:
+    case WebAXRoleSpinButton:
+        return result.append("SpinButton");
+    case WebAXRoleSplitGroup:
+        return result.append("SplitGroup");
+    case WebAXRoleSplitter:
+        return result.append("Splitter");
+    case WebAXRoleStaticText:
+        return result.append("StaticText");
+    case WebAXRoleStatus:
+        return result.append("Status");
+    case WebAXRoleSystemWide:
+        return result.append("SystemWide");
+    case WebAXRoleTabGroup:
+        return result.append("TabGroup");
+    case WebAXRoleTabList:
         return result.append("TabList");
-    case WebAccessibilityRoleTabPanel:
+    case WebAXRoleTabPanel:
         return result.append("TabPanel");
-    case WebAccessibilityRoleTab:
+    case WebAXRoleTab:
         return result.append("Tab");
-    case WebAccessibilityRoleTreeRole:
-        return result.append("Tree");
-    case WebAccessibilityRoleTreeGrid:
+    case WebAXRoleTableHeaderContainer:
+        return result.append("TableHeaderContainer");
+    case WebAXRoleTable:
+        return result.append("Table");
+    case WebAXRoleTextArea:
+        return result.append("TextArea");
+    case WebAXRoleTextField:
+        return result.append("TextField");
+    case WebAXRoleTimer:
+        return result.append("Timer");
+    case WebAXRoleToggleButton:
+        return result.append("ToggleButton");
+    case WebAXRoleToolbar:
+        return result.append("Toolbar");
+    case WebAXRoleTreeGrid:
         return result.append("TreeGrid");
-    case WebAccessibilityRoleTreeItemRole:
+    case WebAXRoleTreeItem:
         return result.append("TreeItem");
-    case WebAccessibilityRoleUnknown:
+    case WebAXRoleTree:
+        return result.append("Tree");
+    case WebAXRoleUnknown:
+        return result.append("Unknown");
+    case WebAXRoleUserInterfaceTooltip:
+        return result.append("UserInterfaceTooltip");
+    case WebAXRoleValueIndicator:
+        return result.append("ValueIndicator");
+    case WebAXRoleWebArea:
+        return result.append("WebArea");
+    case WebAXRoleWindow:
+        return result.append("Window");
     default:
         return result.append("Unknown");
     }
@@ -299,7 +303,7 @@ string getStringValue(const WebAccessibilityObject& object)
 
 string getRole(const WebAccessibilityObject& object)
 {
-    string roleString = roleToString(object.roleValue());
+    string roleString = roleToString(object.role());
 
     // Special-case canvas with fallback content because Chromium wants to
     // treat this as essentially a separate role that it can map differently depending