Clean up accessibility enums for use in Chromium.

public/web/WebAccessibilityRole.h

Index: public/web/WebAccessibilityRole.h
diff --git a/public/web/WebAccessibilityRole.h b/public/web/WebAccessibilityRole.h
index c2c059898b8976e84d70f1874e9d561a8382530b..82dab58962202febd68faca46dd2dffdf3b5bc3b 100644
--- a/public/web/WebAccessibilityRole.h
+++ b/public/web/WebAccessibilityRole.h
@@ -36,16 +36,15 @@
 namespace WebKit {
 
 // These values must match WebCore::AccessibilityRole values
+// DEPRECATED: these will be replaced with the enums defined in
+// WebAXTypes.h (http://crbug.com/269034).
 enum WebAccessibilityRole {
-    WebAccessibilityRoleAnnotation = 1,
-    WebAccessibilityRoleApplication,
+    WebAccessibilityRoleApplicationAlertDialog = 1,
     WebAccessibilityRoleApplicationAlert,
-    WebAccessibilityRoleApplicationAlertDialog,
-    WebAccessibilityRoleApplicationDialog,
-    WebAccessibilityRoleApplicationLog,
-    WebAccessibilityRoleApplicationMarquee,
-    WebAccessibilityRoleApplicationStatus,
-    WebAccessibilityRoleApplicationTimer,
+    WebAccessibilityRoleAnnotation,
+    WebAccessibilityRoleLandmarkApplication,
+    WebAccessibilityRoleDocumentArticle,
+    WebAccessibilityRoleLandmarkBanner,
     WebAccessibilityRoleBrowser,
     WebAccessibilityRoleBusyIndicator,
     WebAccessibilityRoleButton,
@@ -53,20 +52,19 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleCell,
     WebAccessibilityRoleCheckBox,
     WebAccessibilityRoleColorWell,
-    WebAccessibilityRoleColumn,
     WebAccessibilityRoleColumnHeader,
+    WebAccessibilityRoleColumn,
     WebAccessibilityRoleComboBox,
+    WebAccessibilityRoleLandmarkComplementary,
+    WebAccessibilityRoleLandmarkContentInfo,
     WebAccessibilityRoleDefinition,
-    WebAccessibilityRoleDescriptionListTerm,
     WebAccessibilityRoleDescriptionListDetail,
+    WebAccessibilityRoleDescriptionListTerm,
+    WebAccessibilityRoleApplicationDialog,
     WebAccessibilityRoleDirectory,
     WebAccessibilityRoleDisclosureTriangle,
     WebAccessibilityRoleDiv,
     WebAccessibilityRoleDocument,
-    WebAccessibilityRoleDocumentArticle,
-    WebAccessibilityRoleDocumentMath,
-    WebAccessibilityRoleDocumentNote,
-    WebAccessibilityRoleDocumentRegion,
     WebAccessibilityRoleDrawer,
     WebAccessibilityRoleEditableText,
     WebAccessibilityRoleFooter,
@@ -78,33 +76,32 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleHelpTag,
     WebAccessibilityRoleHorizontalRule,
     WebAccessibilityRoleIgnored,
-    WebAccessibilityRoleImage,
-    WebAccessibilityRoleImageMap,
     WebAccessibilityRoleImageMapLink,
+    WebAccessibilityRoleImageMap,
+    WebAccessibilityRoleImage,
     WebAccessibilityRoleIncrementor,
     WebAccessibilityRoleLabel,
-    WebAccessibilityRoleLandmarkApplication,
-    WebAccessibilityRoleLandmarkBanner,
-    WebAccessibilityRoleLandmarkComplementary,
-    WebAccessibilityRoleLandmarkContentInfo,
-    WebAccessibilityRoleLandmarkMain,
-    WebAccessibilityRoleLandmarkNavigation,
-    WebAccessibilityRoleLandmarkSearch,
     WebAccessibilityRoleLegend,
     WebAccessibilityRoleLink,
-    WebAccessibilityRoleList,
-    WebAccessibilityRoleListBox,
     WebAccessibilityRoleListBoxOption,
+    WebAccessibilityRoleListBox,
     WebAccessibilityRoleListItem,
     WebAccessibilityRoleListMarker,
+    WebAccessibilityRoleList,
+    WebAccessibilityRoleApplicationLog,
+    WebAccessibilityRoleLandmarkMain,
+    WebAccessibilityRoleApplicationMarquee,
     WebAccessibilityRoleMathElement,
+    WebAccessibilityRoleDocumentMath,
     WebAccessibilityRoleMatte,
-    WebAccessibilityRoleMenu,
     WebAccessibilityRoleMenuBar,
     WebAccessibilityRoleMenuButton,
     WebAccessibilityRoleMenuItem,
-    WebAccessibilityRoleMenuListPopup,
     WebAccessibilityRoleMenuListOption,
+    WebAccessibilityRoleMenuListPopup,
+    WebAccessibilityRoleMenu,
+    WebAccessibilityRoleLandmarkNavigation,
+    WebAccessibilityRoleDocumentNote,
     WebAccessibilityRoleOutline,
     WebAccessibilityRoleParagraph,
     WebAccessibilityRolePopUpButton,
@@ -112,42 +109,50 @@ enum WebAccessibilityRole {
     WebAccessibilityRoleProgressIndicator,
     WebAccessibilityRoleRadioButton,
     WebAccessibilityRoleRadioGroup,
+    WebAccessibilityRoleDocumentRegion,
+    WebAccessibilityRoleRootWebArea,
     WebAccessibilityRoleRowHeader,
     WebAccessibilityRoleRow,
-    WebAccessibilityRoleRuler,
     WebAccessibilityRoleRulerMarker,
+    WebAccessibilityRoleRuler,
+    WebAccessibilityRoleSVGRoot,
     WebAccessibilityRoleScrollArea,
     WebAccessibilityRoleScrollBar,
     WebAccessibilityRoleSeamlessWebArea,
+    WebAccessibilityRoleLandmarkSearch,
     WebAccessibilityRoleSheet,
     WebAccessibilityRoleSlider,
     WebAccessibilityRoleSliderThumb,
-    WebAccessibilityRoleSpinButton,
     WebAccessibilityRoleSpinButtonPart,
+    WebAccessibilityRoleSpinButton,
     WebAccessibilityRoleSplitGroup,
     WebAccessibilityRoleSplitter,
     WebAccessibilityRoleStaticText,
+    WebAccessibilityRoleApplicationStatus,
     WebAccessibilityRoleSystemWide,
-    WebAccessibilityRoleSVGRoot,
     WebAccessibilityRoleTabGroup,
     WebAccessibilityRoleTabList,
     WebAccessibilityRoleTabPanel,
     WebAccessibilityRoleTab,
-    WebAccessibilityRoleTable,
     WebAccessibilityRoleTableHeaderContainer,
+    WebAccessibilityRoleTable,
     WebAccessibilityRoleTextArea,
-    WebAccessibilityRoleTreeRole,
-    WebAccessibilityRoleTreeGrid,
-    WebAccessibilityRoleTreeItemRole,
     WebAccessibilityRoleTextField,
+    WebAccessibilityRoleApplicationTimer,
     WebAccessibilityRoleToggleButton,
     WebAccessibilityRoleToolbar,
+    WebAccessibilityRoleTreeGrid,
+    WebAccessibilityRoleTreeItemRole,
+    WebAccessibilityRoleTreeRole,
     WebAccessibilityRoleUnknown,
     WebAccessibilityRoleUserInterfaceTooltip,
     WebAccessibilityRoleValueIndicator,
     WebAccessibilityRoleWebArea,
-    WebAccessibilityRoleWebCoreLink,
     WebAccessibilityRoleWindow,
+
+    // Deprecated.
+    WebAccessibilityRoleApplication,
+    WebAccessibilityRoleWebCoreLink
 };
 
 } // namespace WebKit