Move AX Role predicates into ax_role_properties.h.

content/browser/accessibility/browser_accessibility.cc

Index: content/browser/accessibility/browser_accessibility.cc
diff --git a/content/browser/accessibility/browser_accessibility.cc b/content/browser/accessibility/browser_accessibility.cc
index a90d107f32d0658e18bcae416008ec3b43ecbd8b..d8bbe1cec43cdaca4f4d5acaf798f8b2bc07fa05 100644
--- a/content/browser/accessibility/browser_accessibility.cc
+++ b/content/browser/accessibility/browser_accessibility.cc
@@ -742,13 +742,14 @@ bool BrowserAccessibility::GetHtmlAttribute(
 
 BrowserAccessibility* BrowserAccessibility::GetTable() const {
   BrowserAccessibility* table = const_cast<BrowserAccessibility*>(this);
-  while (table && !table->IsTableLikeRole())
+  while (table && !ui::IsTableLikeRole(table->GetRole()))
     table = table->PlatformGetParent();
   return table;
 }
 
 BrowserAccessibility* BrowserAccessibility::GetTableCell(int index) const {
-  if (!IsTableLikeRole() && !IsCellOrTableHeaderRole())
+  if (!ui::IsTableLikeRole(GetRole()) &&
+      !ui::IsCellOrTableHeaderRole(GetRole()))
     return nullptr;
 
   BrowserAccessibility* table = GetTable();
@@ -763,7 +764,8 @@ BrowserAccessibility* BrowserAccessibility::GetTableCell(int index) const {
 
 BrowserAccessibility* BrowserAccessibility::GetTableCell(int row,
                                                          int column) const {
-  if (!IsTableLikeRole() && !IsCellOrTableHeaderRole())
+  if (!ui::IsTableLikeRole(GetRole()) &&
+      !ui::IsCellOrTableHeaderRole(GetRole()))
     return nullptr;
   if (row < 0 || row >= GetTableRowCount() || column < 0 ||
       column >= GetTableColumnCount()) {
@@ -787,7 +789,7 @@ BrowserAccessibility* BrowserAccessibility::GetTableCell(int row,
 }
 
 int BrowserAccessibility::GetTableCellIndex() const {
-  if (!IsCellOrTableHeaderRole())
+  if (!ui::IsCellOrTableHeaderRole(GetRole()))
     return -1;
 
   BrowserAccessibility* table = GetTable();
@@ -817,7 +819,7 @@ int BrowserAccessibility::GetTableColumnCount() const {
 }
 
 int BrowserAccessibility::GetTableColumnSpan() const {
-  if (!IsCellOrTableHeaderRole())
+  if (!ui::IsCellOrTableHeaderRole(GetRole()))
     return 0;
 
   int column_span;
@@ -839,7 +841,7 @@ int BrowserAccessibility::GetTableRowCount() const {
 }
 
 int BrowserAccessibility::GetTableRowSpan() const {
-  if (!IsCellOrTableHeaderRole())
+  if (!ui::IsCellOrTableHeaderRole(GetRole()))
     return 0;
 
   int row_span;
@@ -860,18 +862,6 @@ bool BrowserAccessibility::HasAction(ui::AXAction action_enum) const {
   return GetData().HasAction(action_enum);
 }
 
-bool BrowserAccessibility::IsCellOrTableHeaderRole() const {
-  return (GetRole() == ui::AX_ROLE_CELL ||
-          GetRole() == ui::AX_ROLE_COLUMN_HEADER ||
-          GetRole() == ui::AX_ROLE_ROW_HEADER);
-}
-
-bool BrowserAccessibility::IsTableLikeRole() const {
-  return (GetRole() == ui::AX_ROLE_TABLE ||
-          GetRole() == ui::AX_ROLE_GRID ||
-          GetRole() == ui::AX_ROLE_TREE_GRID);
-}
-
 bool BrowserAccessibility::HasCaret() const {
   if (IsSimpleTextControl() && HasIntAttribute(ui::AX_ATTR_TEXT_SEL_START) &&
       HasIntAttribute(ui::AX_ATTR_TEXT_SEL_END)) {