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 1b34a2c7b74f477dbe55b57a3165d7141b0534d3..23b5bb1df2651f9d39fe0c4eafa81994b1442e81 100644
--- a/Source/testing/runner/AccessibilityUIElementChromium.cpp
+++ b/Source/testing/runner/AccessibilityUIElementChromium.cpp
@@ -35,6 +35,7 @@
 #include "public/platform/WebPoint.h"
 #include "public/platform/WebRect.h"
 #include "public/platform/WebString.h"
+#include "public/web/WebAXTypes.h"
 #include "public/web/WebAccessibilityObject.h"
 
 using namespace WebKit;
@@ -46,226 +47,230 @@ namespace {
 
 // Map role value to string, matching Safari/Mac platform implementation to
 // avoid rebaselining layout tests.
-string roleToString(WebAccessibilityRole role)
+string roleToString(WebAXTypes::Role 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 WebAXTypes::AlertDialogRole:
+        return result.append("AlertDialog");
+    case WebAXTypes::AlertRole:
+        return result.append("Alert");
+    case WebAXTypes::AnnotationRole:
+        return result.append("Annotation");
+    case WebAXTypes::ApplicationRole:
         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 WebAXTypes::ArticleRole:
+        return result.append("Article");
+    case WebAXTypes::BannerRole:
+        return result.append("Banner");
+    case WebAXTypes::BrowserRole:
         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 WebAXTypes::BusyIndicatorRole:
+        return result.append("BusyIndicator");
+    case WebAXTypes::ButtonRole:
+        return result.append("Button");
+    case WebAXTypes::CanvasRole:
+        return result.append("Canvas");
+    case WebAXTypes::CellRole:
         return result.append("Cell");
-    case WebAccessibilityRoleColumnHeader:
+    case WebAXTypes::CheckBoxRole:
+        return result.append("CheckBox");
+    case WebAXTypes::ColorWellRole:
+        return result.append("ColorWell");
+    case WebAXTypes::ColumnHeaderRole:
         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 WebAXTypes::ColumnRole:
+        return result.append("Column");
+    case WebAXTypes::ComboBoxRole:
+        return result.append("ComboBox");
+    case WebAXTypes::ComplementaryRole:
+        return result.append("Complementary");
+    case WebAXTypes::ContentInfoRole:
+        return result.append("ContentInfo");
+    case WebAXTypes::DefinitionRole:
         return result.append("Definition");
-    case WebAccessibilityRoleDescriptionListTerm:
-        return result.append("DescriptionListTerm");
-    case WebAccessibilityRoleDescriptionListDetail:
+    case WebAXTypes::DescriptionListDetailRole:
         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 WebAXTypes::DescriptionListTermRole:
+        return result.append("DescriptionListTerm");
+    case WebAXTypes::DialogRole:
+        return result.append("Dialog");
+    case WebAXTypes::DirectoryRole:
         return result.append("Directory");
-    case WebAccessibilityRoleDocumentMath:
-        return result.append("Math");
-    case WebAccessibilityRoleEditableText:
+    case WebAXTypes::DisclosureTriangleRole:
+        return result.append("DisclosureTriangle");
+    case WebAXTypes::DivRole:
+        return result.append("Div");
+    case WebAXTypes::DocumentRole:
+        return result.append("Document");
+    case WebAXTypes::DrawerRole:
+        return result.append("Drawer");
+    case WebAXTypes::EditableTextRole:
         return result.append("EditableText");
-    case WebAccessibilityRoleFooter:
+    case WebAXTypes::FooterRole:
         return result.append("Footer");
-    case WebAccessibilityRoleIgnored:
+    case WebAXTypes::FormRole:
+        return result.append("Form");
+    case WebAXTypes::GridRole:
+        return result.append("Grid");
+    case WebAXTypes::GroupRole:
+        return result.append("Group");
+    case WebAXTypes::GrowAreaRole:
+        return result.append("GrowArea");
+    case WebAXTypes::HeadingRole:
+        return result.append("Heading");
+    case WebAXTypes::HelpTagRole:
+        return result.append("HelpTag");
+    case WebAXTypes::HorizontalRuleRole:
+        return result.append("HorizontalRule");
+    case WebAXTypes::IgnoredRole:
         return result.append("Ignored");
-    case WebAccessibilityRoleListItem:
+    case WebAXTypes::ImageMapLinkRole:
+        return result.append("ImageMapLink");
+    case WebAXTypes::ImageMapRole:
+        return result.append("ImageMap");
+    case WebAXTypes::ImageRole:
+        return result.append("Image");
+    case WebAXTypes::IncrementorRole:
+        return result.append("Incrementor");
+    case WebAXTypes::LabelRole:
+        return result.append("Label");
+    case WebAXTypes::LegendRole:
+        return result.append("Legend");
+    case WebAXTypes::LinkRole:
+        return result.append("Link");
+    case WebAXTypes::ListBoxOptionRole:
+        return result.append("ListBoxOption");
+    case WebAXTypes::ListBoxRole:
+        return result.append("ListBox");
+    case WebAXTypes::ListItemRole:
         return result.append("ListItem");
-    case WebAccessibilityRoleMenuListPopup:
-        return result.append("MenuListPopup");
-    case WebAccessibilityRoleMenuListOption:
+    case WebAXTypes::ListMarkerRole:
+        return result.append("ListMarker");
+    case WebAXTypes::ListRole:
+        return result.append("List");
+    case WebAXTypes::LogRole:
+        return result.append("Log");
+    case WebAXTypes::MainRole:
+        return result.append("Main");
+    case WebAXTypes::MarqueeRole:
+        return result.append("Marquee");
+    case WebAXTypes::MathElementRole:
+        return result.append("MathElement");
+    case WebAXTypes::MathRole:
+        return result.append("Math");
+    case WebAXTypes::MatteRole:
+        return result.append("Matte");
+    case WebAXTypes::MenuBarRole:
+        return result.append("MenuBar");
+    case WebAXTypes::MenuButtonRole:
+        return result.append("MenuButton");
+    case WebAXTypes::MenuItemRole:
+        return result.append("MenuItem");
+    case WebAXTypes::MenuListOptionRole:
         return result.append("MenuListOption");
-    case WebAccessibilityRolePresentational:
+    case WebAXTypes::MenuListPopupRole:
+        return result.append("MenuListPopup");
+    case WebAXTypes::MenuRole:
+        return result.append("Menu");
+    case WebAXTypes::NavigationRole:
+        return result.append("Navigation");
+    case WebAXTypes::NoteRole:
+        return result.append("Note");
+    case WebAXTypes::OutlineRole:
+        return result.append("Outline");
+    case WebAXTypes::ParagraphRole:
+        return result.append("Paragraph");
+    case WebAXTypes::PopUpButtonRole:
+        return result.append("PopUpButton");
+    case WebAXTypes::PresentationalRole:
         return result.append("Presentational");
-    case WebAccessibilityRoleSpinButton:
-        return result.append("SpinButton");
-    case WebAccessibilityRoleSpinButtonPart:
+    case WebAXTypes::ProgressIndicatorRole:
+        return result.append("ProgressIndicator");
+    case WebAXTypes::RadioButtonRole:
+        return result.append("RadioButton");
+    case WebAXTypes::RadioGroupRole:
+        return result.append("RadioGroup");
+    case WebAXTypes::RegionRole:
+        return result.append("Region");
+    case WebAXTypes::RootWebAreaRole:
+        return result.append("RootWebArea");
+    case WebAXTypes::RowHeaderRole:
+        return result.append("RowHeader");
+    case WebAXTypes::RowRole:
+        return result.append("Row");
+    case WebAXTypes::RulerMarkerRole:
+        return result.append("RulerMarker");
+    case WebAXTypes::RulerRole:
+        return result.append("Ruler");
+    case WebAXTypes::SVGRootRole:
+        return result.append("SVGRoot");
+    case WebAXTypes::ScrollAreaRole:
+        return result.append("ScrollArea");
+    case WebAXTypes::ScrollBarRole:
+        return result.append("ScrollBar");
+    case WebAXTypes::SeamlessWebAreaRole:
+        return result.append("SeamlessWebArea");
+    case WebAXTypes::SearchRole:
+        return result.append("Search");
+    case WebAXTypes::SheetRole:
+        return result.append("Sheet");
+    case WebAXTypes::SliderRole:
+        return result.append("Slider");
+    case WebAXTypes::SliderThumbRole:
+        return result.append("SliderThumb");
+    case WebAXTypes::SpinButtonPartRole:
         return result.append("SpinButtonPart");
-    case WebAccessibilityRoleTabList:
+    case WebAXTypes::SpinButtonRole:
+        return result.append("SpinButton");
+    case WebAXTypes::SplitGroupRole:
+        return result.append("SplitGroup");
+    case WebAXTypes::SplitterRole:
+        return result.append("Splitter");
+    case WebAXTypes::StaticTextRole:
+        return result.append("StaticText");
+    case WebAXTypes::StatusRole:
+        return result.append("Status");
+    case WebAXTypes::SystemWideRole:
+        return result.append("SystemWide");
+    case WebAXTypes::TabGroupRole:
+        return result.append("TabGroup");
+    case WebAXTypes::TabListRole:
         return result.append("TabList");
-    case WebAccessibilityRoleTabPanel:
+    case WebAXTypes::TabPanelRole:
         return result.append("TabPanel");
-    case WebAccessibilityRoleTab:
+    case WebAXTypes::TabRole:
         return result.append("Tab");
-    case WebAccessibilityRoleTreeRole:
-        return result.append("Tree");
-    case WebAccessibilityRoleTreeGrid:
+    case WebAXTypes::TableHeaderContainerRole:
+        return result.append("TableHeaderContainer");
+    case WebAXTypes::TableRole:
+        return result.append("Table");
+    case WebAXTypes::TextAreaRole:
+        return result.append("TextArea");
+    case WebAXTypes::TextFieldRole:
+        return result.append("TextField");
+    case WebAXTypes::TimerRole:
+        return result.append("Timer");
+    case WebAXTypes::ToggleButtonRole:
+        return result.append("ToggleButton");
+    case WebAXTypes::ToolbarRole:
+        return result.append("Toolbar");
+    case WebAXTypes::TreeGridRole:
         return result.append("TreeGrid");
-    case WebAccessibilityRoleTreeItemRole:
+    case WebAXTypes::TreeItemRole:
         return result.append("TreeItem");
-    case WebAccessibilityRoleUnknown:
+    case WebAXTypes::TreeRole:
+        return result.append("Tree");
+    case WebAXTypes::UnknownRole:
+        return result.append("Unknown");
+    case WebAXTypes::UserInterfaceTooltipRole:
+        return result.append("UserInterfaceTooltip");
+    case WebAXTypes::ValueIndicatorRole:
+        return result.append("ValueIndicator");
+    case WebAXTypes::WebAreaRole:
+        return result.append("WebArea");
+    case WebAXTypes::WindowRole:
+        return result.append("Window");
     default:
         return result.append("Unknown");
     }
@@ -299,7 +304,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