Remove TalkBack role description for table cell

TalkBack should just speak the cell data for cells in table.

TBR=avi@chromium.org

Bug: 669622
Change-Id: Iecb736acdbe36d106672b97425bb72988eef1efa
Reviewed-on: https://chromium-review.googlesource.com/1108920
Commit-Queue: James Wallace-Lee <jamwalla@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569278}

content/app/strings/content_strings.grd

@@ -476,9 +476,6 @@ below:
         <message name="IDS_AX_ROLE_BUTTON" desc="Accessibility role description for a button">
           button
         </message>
-        <message name="IDS_AX_ROLE_CELL" desc="Accessibility role description for a cell, like in a table or grid">
-          cell
-        </message>
         <message name="IDS_AX_ROLE_COLOR_WELL" desc="Accessibility role description for a color picker">
           color picker
         </message>

content/browser/accessibility/browser_accessibility_android.cc

@@ -510,7 +510,7 @@ base::string16 BrowserAccessibilityAndroid::GetRoleDescription() const {
       // No role description.
       break;
     case ax::mojom::Role::kCell:
-      message_id = IDS_AX_ROLE_CELL;
+      // No role description.
       break;
     case ax::mojom::Role::kCheckBox:
       message_id = IDS_AX_ROLE_CHECK_BOX;

content/test/data/accessibility/aria/aria-col-attr-expected-android.txt

@@ -5,12 +5,12 @@ android.webkit.WebView focusable focused scrollable
 ++++++android.view.View role_description='column header' collection_item heading name='cell 4' row_span=1 column_index=1 column_span=1
 ++++++android.view.View role_description='column header' collection_item heading name='cell 5' row_span=1 column_index=2 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='cell 2' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='cell 3' row_index=1 row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='cell 4' row_index=1 row_span=1 column_index=2 column_span=1
-++++++android.view.View role_description='cell' collection_item name='cell 5' row_index=1 row_span=1 column_index=3 column_span=1
+++++++android.view.View collection_item name='cell 2' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='cell 3' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='cell 4' row_index=1 row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='cell 5' row_index=1 row_span=1 column_index=3 column_span=1
+++++android.view.View
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/aria/aria-columnheader-expected-android.txt

@@ -4,11 +4,11 @@ android.webkit.WebView focusable focused scrollable
 ++++++android.view.View role_description='column header' collection_item heading name='Browser' row_span=1 column_span=1
 ++++++android.view.View role_description='column header' collection_item heading name='Rendering Engine' row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Chrome' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='Chrome' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++android.view.View
+++++++android.view.View collection_item name='Safari' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='WebKit' row_index=2 row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Safari' row_index=2 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='WebKit' row_index=2 row_span=1 column_index=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/aria/aria-grid-expected-android.txt

@@ -4,8 +4,8 @@ android.webkit.WebView focusable focused scrollable
 ++++++android.view.View role_description='column header' collection_item heading name='Browser' row_span=1 column_span=1
 ++++++android.view.View role_description='column header' collection_item heading name='Rendering Engine' row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Chrome' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='Chrome' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/aria/aria-gridcell-expected-android.txt

@@ -4,8 +4,8 @@ android.webkit.WebView focusable focused scrollable
 ++++++android.view.View role_description='column header' collection_item heading name='Browser' row_span=1 column_span=1
 ++++++android.view.View role_description='column header' collection_item heading name='Rendering Engine' row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Chrome' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='Chrome' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/aria/aria-row-attr-expected-android.txt

@@ -5,9 +5,9 @@ android.webkit.WebView focusable focused scrollable
 ++++++android.view.View role_description='column header' collection_item heading name='cell 3' row_span=1 column_index=1 column_span=1
 ++++++android.view.View role_description='column header' collection_item heading name='cell 4' row_span=1 column_index=2 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='cell 2' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='cell 3' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='cell 2' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='cell 3' row_index=1 row_span=1 column_index=1 column_span=1
+++++android.view.View
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/aria/aria-row-expected-android.txt

@@ -4,11 +4,11 @@ android.webkit.WebView focusable focused scrollable
 ++++++android.view.View role_description='column header' collection_item heading name='Browser' row_span=1 column_span=1
 ++++++android.view.View role_description='column header' collection_item heading name='Rendering Engine' row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Chrome' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='Chrome' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++android.view.View
+++++++android.view.View collection_item name='Safari' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='WebKit' row_index=2 row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Safari' row_index=2 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='WebKit' row_index=2 row_span=1 column_index=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/aria/aria-rowheader-expected-android.txt

@@ -2,13 +2,13 @@ android.webkit.WebView focusable focused scrollable
 ++android.widget.GridView role_description='table' collection row_count=2 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Browser' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Chrome' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Safari' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='Chrome' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='Safari' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Rendering Engine' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='WebKit' row_index=1 row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='WebKit' row_index=1 row_span=1 column_index=2 column_span=1
+++++android.view.View
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/aria/aria-sort-aria-grid-expected-android.txt

@@ -3,52 +3,52 @@ android.webkit.WebView focusable focused scrollable
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='B' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='B' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='table' collection row_count=3 column_count=1
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='B' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='B' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='table' collection row_count=3 column_count=1
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='B' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='B' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='table' collection row_count=3 column_count=1
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='B' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='B' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='table' collection row_count=3 column_count=1
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='table' collection row_count=1 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='B' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='B' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
@@ -56,8 +56,8 @@ android.webkit.WebView focusable focused scrollable
 ++android.widget.GridView role_description='table' collection row_count=1 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='B' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='B' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
@@ -65,8 +65,8 @@ android.webkit.WebView focusable focused scrollable
 ++android.widget.GridView role_description='table' collection row_count=1 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='B' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='B' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
@@ -74,8 +74,8 @@ android.webkit.WebView focusable focused scrollable
 ++android.widget.GridView role_description='table' collection row_count=1 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='B' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='B' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
@@ -83,9 +83,9 @@ android.webkit.WebView focusable focused scrollable
 ++android.widget.GridView role_description='table' collection row_count=1 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=2 column_span=1
+++++android.view.View
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/aria/aria-sort-html-table-expected-android.txt

@@ -3,52 +3,52 @@ android.webkit.WebView focusable focused scrollable
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='B' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='B' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='table' collection name='Data table' row_count=3 column_count=1
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='B' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='B' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='table' collection name='Data table' row_count=3 column_count=1
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='B' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='B' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='table' collection name='Data table' row_count=3 column_count=1
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='B' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='B' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='table' collection name='Data table' row_count=3 column_count=1
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='table' collection name='Data table' row_count=1 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='B' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='B' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
@@ -56,8 +56,8 @@ android.webkit.WebView focusable focused scrollable
 ++android.widget.GridView role_description='table' collection name='Data table' row_count=1 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='B' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='B' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
@@ -65,8 +65,8 @@ android.webkit.WebView focusable focused scrollable
 ++android.widget.GridView role_description='table' collection name='Data table' row_count=1 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='B' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='B' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
@@ -74,8 +74,8 @@ android.webkit.WebView focusable focused scrollable
 ++android.widget.GridView role_description='table' collection name='Data table' row_count=1 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='B' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='B' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
@@ -83,8 +83,8 @@ android.webkit.WebView focusable focused scrollable
 ++android.widget.GridView role_description='table' collection name='Data table' row_count=1 column_count=3
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='A' row_span=1 column_index=2 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='A' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
@@ -93,9 +93,9 @@ android.webkit.WebView focusable focused scrollable
 ++++android.view.View
 ++++++android.view.View role_description='column header' collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='B' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='B' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++android.view.View name='Alphabet'
+++android.view.View name='Alphabet'
\ No newline at end of file

content/test/data/accessibility/aria/aria-treegrid-expected-android.txt

 android.webkit.WebView focusable focused scrollable
 ++android.widget.GridView role_description='tree grid' collection row_count=2 column_count=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Cell at level 1' row_span=1 column_span=1
+++++++android.view.View collection_item name='Cell at level 1' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Cell at level 2' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='Cell at level 2' row_index=1 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++android.widget.GridView role_description='tree grid' collection row_count=1 column_count=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Cell at level 1' row_span=1 column_span=1
+++++++android.view.View collection_item name='Cell at level 1' row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View

content/test/data/accessibility/html/caption-expected-android.txt

@@ -5,11 +5,11 @@ android.webkit.WebView focusable focused scrollable
 ++++++android.view.View role_description='column header' collection_item heading name='Browser' row_span=1 column_span=1
 ++++++android.view.View role_description='column header' collection_item heading name='Engine' row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Chrome' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='Chrome' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='Blink' row_index=1 row_span=1 column_index=1 column_span=1
+++++android.view.View
+++++++android.view.View collection_item name='Safari' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='WebKit' row_index=2 row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Safari' row_index=2 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='WebKit' row_index=2 row_span=1 column_index=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/html/table-simple-expected-android.txt

@@ -4,11 +4,11 @@ android.webkit.WebView focusable focused scrollable name='Table example'
 ++++++android.view.View role_description='column header' collection_item heading name='Pair' row_span=1 column_span=1
 ++++++android.view.View role_description='column header' collection_item heading name='Single' row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='AB' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='B' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='AB' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='B' row_index=1 row_span=1 column_index=1 column_span=1
+++++android.view.View
+++++++android.view.View collection_item name='CD' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='D' row_index=2 row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='CD' row_index=2 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='D' row_index=2 row_span=1 column_index=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/html/table-th-colheader-expected-android.txt

@@ -4,8 +4,8 @@ android.webkit.WebView focusable focused scrollable
 ++++++android.view.View role_description='column header' collection_item heading name='Firstname' row_span=1 column_span=1
 ++++++android.view.View role_description='column header' collection_item heading name='Lastname' row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='Jill' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Smith' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='Jill' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='Smith' row_index=1 row_span=1 column_index=1 column_span=1
+++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/html/table-th-rowheader-expected-android.txt

@@ -2,10 +2,10 @@ android.webkit.WebView focusable focused scrollable name='Table example - th row
 ++android.widget.GridView role_description='table' collection row_count=2 column_count=2
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Firstname' row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Jill' row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='Jill' row_span=1 column_index=1 column_span=1
 ++++android.view.View
 ++++++android.view.View role_description='row header' collection_item heading name='Lastname' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='Smith' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='Smith' row_index=1 row_span=1 column_index=1 column_span=1
+++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file

content/test/data/accessibility/html/table-thead-tbody-tfoot-expected-android.txt

@@ -4,14 +4,14 @@ android.webkit.WebView focusable focused scrollable name='Table example - thead,
 ++++++android.view.View role_description='column header' collection_item heading name='Sum' row_span=1 column_span=1
 ++++++android.view.View role_description='column header' collection_item heading name='Subtraction' row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='10' row_index=1 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='7' row_index=1 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='10' row_index=1 row_span=1 column_span=1
+++++++android.view.View collection_item name='7' row_index=1 row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='2' row_index=2 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='4' row_index=2 row_span=1 column_index=1 column_span=1
+++++++android.view.View collection_item name='2' row_index=2 row_span=1 column_span=1
+++++++android.view.View collection_item name='4' row_index=2 row_span=1 column_index=1 column_span=1
+++++android.view.View
+++++++android.view.View collection_item name='12' row_index=3 row_span=1 column_span=1
+++++++android.view.View collection_item name='3' row_index=3 row_span=1 column_index=1 column_span=1
 ++++android.view.View
-++++++android.view.View role_description='cell' collection_item name='12' row_index=3 row_span=1 column_span=1
-++++++android.view.View role_description='cell' collection_item name='3' row_index=3 row_span=1 column_index=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++++android.view.View
\ No newline at end of file