Expose internal treegrid role, do some cleanup for table/grid/treegrid handling

content/browser/accessibility/browser_accessibility_android.cc

Index: content/browser/accessibility/browser_accessibility_android.cc
diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc
index 85acf003c459ae8b5cf30ff25179562b24366cff..b488bf628f031773cfedfbfce4688f90763e1d2d 100644
--- a/content/browser/accessibility/browser_accessibility_android.cc
+++ b/content/browser/accessibility/browser_accessibility_android.cc
@@ -174,11 +174,9 @@ bool BrowserAccessibilityAndroid::IsCollapsed() const {
 }
 
 bool BrowserAccessibilityAndroid::IsCollection() const {
-  return (GetRole() == ui::AX_ROLE_GRID ||
-          GetRole() == ui::AX_ROLE_LIST ||
+  return (IsTableOrGridOrTreeGridRole() || GetRole() == ui::AX_ROLE_LIST ||

[dmazzoni, 2017/04/18 21:59:38]

Maybe IsTableLikeRole?

[aleventhal, 2017/04/19 20:24:02]

Done.

           GetRole() == ui::AX_ROLE_LIST_BOX ||
           GetRole() == ui::AX_ROLE_DESCRIPTION_LIST ||
-          GetRole() == ui::AX_ROLE_TABLE ||
           GetRole() == ui::AX_ROLE_TREE);
 }
 
@@ -375,6 +373,7 @@ const char* BrowserAccessibilityAndroid::GetClassName() const {
       class_name = ui::kAXTabWidgetClassname;
       break;
     case ui::AX_ROLE_GRID:
+    case ui::AX_ROLE_TREE_GRID:
     case ui::AX_ROLE_TABLE:
       class_name = ui::kAXGridViewClassname;
       break;
@@ -1246,8 +1245,7 @@ int BrowserAccessibilityAndroid::AndroidRangeType() const {
 }
 
 int BrowserAccessibilityAndroid::RowCount() const {
-  if (GetRole() == ui::AX_ROLE_GRID ||
-      GetRole() == ui::AX_ROLE_TABLE) {
+  if (IsTableOrGridOrTreeGridRole()) {
     return CountChildrenWithRole(ui::AX_ROLE_ROW);
   }
 
@@ -1262,8 +1260,7 @@ int BrowserAccessibilityAndroid::RowCount() const {
 }
 
 int BrowserAccessibilityAndroid::ColumnCount() const {
-  if (GetRole() == ui::AX_ROLE_GRID ||
-      GetRole() == ui::AX_ROLE_TABLE) {
+  if (IsTableOrGridOrTreeGridRole()) {
     return CountChildrenWithRole(ui::AX_ROLE_COLUMN);
   }
   return 0;