NOT FOR REVIEW. Test content_browsertests on Android

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

Index: content/test/data/accessibility/aria/aria-sort-aria-grid-expected-android.txt
diff --git a/content/test/data/accessibility/aria/aria-sort-aria-grid-expected-android.txt b/content/test/data/accessibility/aria/aria-sort-aria-grid-expected-android.txt
index 38bc01d26a725cc5b59896fb6453328cc57e97fa..a97bc6fd9ffd7158768c1a071d5b2defef580f20 100644
--- a/content/test/data/accessibility/aria/aria-sort-aria-grid-expected-android.txt
+++ b/content/test/data/accessibility/aria/aria-sort-aria-grid-expected-android.txt
@@ -1,91 +1,91 @@
 android.webkit.WebView focusable focused scrollable
-++android.widget.GridView collection row_count=3 column_count=1
+++android.widget.GridView role_description='table' collection row_count=3 column_count=1
 ++++android.view.View
-++++++android.view.View clickable collection_item heading name='Alphabet' row_span=1 column_span=1
+++++++android.view.View role_description='column header' clickable collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View clickable collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View clickable collection_item name='B' row_index=2 row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='B' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++android.widget.GridView collection row_count=3 column_count=1
+++android.widget.GridView role_description='table' collection row_count=3 column_count=1
 ++++android.view.View
-++++++android.view.View clickable collection_item heading name='Alphabet' row_span=1 column_span=1
+++++++android.view.View role_description='column header' clickable collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View clickable collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View clickable collection_item name='B' row_index=2 row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='B' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++android.widget.GridView collection row_count=3 column_count=1
+++android.widget.GridView role_description='table' collection row_count=3 column_count=1
 ++++android.view.View
-++++++android.view.View clickable collection_item heading name='Alphabet' row_span=1 column_span=1
+++++++android.view.View role_description='column header' clickable collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View clickable collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View clickable collection_item name='B' row_index=2 row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='B' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++android.widget.GridView collection row_count=3 column_count=1
+++android.widget.GridView role_description='table' collection row_count=3 column_count=1
 ++++android.view.View
-++++++android.view.View clickable collection_item heading name='Alphabet' row_span=1 column_span=1
+++++++android.view.View role_description='column header' clickable collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View clickable collection_item name='B' row_index=1 row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='B' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View clickable collection_item name='A' row_index=2 row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='A' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++android.widget.GridView collection row_count=3 column_count=1
+++android.widget.GridView role_description='table' collection row_count=3 column_count=1
 ++++android.view.View
-++++++android.view.View clickable collection_item heading name='Alphabet' row_span=1 column_span=1
+++++++android.view.View role_description='column header' clickable collection_item heading name='Alphabet' row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View clickable collection_item name='A' row_index=1 row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='A' row_index=1 row_span=1 column_span=1
 ++++android.view.View
-++++++android.view.View clickable collection_item name='A' row_index=2 row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='A' row_index=2 row_span=1 column_span=1
 ++++android.view.View
 ++++android.view.View
-++android.widget.GridView collection row_count=1 column_count=3
+++android.widget.GridView role_description='table' collection row_count=1 column_count=3
 ++++android.view.View
-++++++android.view.View clickable collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View clickable collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View clickable collection_item name='B' row_span=1 column_index=2 column_span=1
+++++++android.view.View role_description='row header' clickable collection_item heading name='Alphabet' row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='B' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++android.widget.GridView collection row_count=1 column_count=3
+++android.widget.GridView role_description='table' collection row_count=1 column_count=3
 ++++android.view.View
-++++++android.view.View clickable collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View clickable collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View clickable collection_item name='B' row_span=1 column_index=2 column_span=1
+++++++android.view.View role_description='row header' clickable collection_item heading name='Alphabet' row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='B' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++android.widget.GridView collection row_count=1 column_count=3
+++android.widget.GridView role_description='table' collection row_count=1 column_count=3
 ++++android.view.View
-++++++android.view.View clickable collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View clickable collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View clickable collection_item name='B' row_span=1 column_index=2 column_span=1
+++++++android.view.View role_description='row header' clickable collection_item heading name='Alphabet' row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='B' row_span=1 column_index=2 column_span=1
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
 ++++android.view.View
-++android.widget.GridView collection row_count=1 column_count=3
+++android.widget.GridView role_description='table' collection row_count=1 column_count=3
 ++++android.view.View
-++++++android.view.View clickable collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View clickable collection_item name='B' row_span=1 column_index=1 column_span=1
-++++++android.view.View clickable collection_item name='A' row_span=1 column_index=2 column_span=1
+++++++android.view.View role_description='row header' clickable collection_item heading name='Alphabet' row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='B' row_span=1 column_index=1 column_span=1
+++++++android.view.View role_description='cell' clickable 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.widget.GridView collection row_count=1 column_count=3
-++++android.view.View
-++++++android.view.View clickable collection_item heading name='Alphabet' row_span=1 column_span=1
-++++++android.view.View clickable collection_item name='A' row_span=1 column_index=1 column_span=1
-++++++android.view.View clickable collection_item name='A' row_span=1 column_index=2 column_span=1
+++android.widget.GridView role_description='table' collection row_count=1 column_count=3
 ++++android.view.View
+++++++android.view.View role_description='row header' clickable collection_item heading name='Alphabet' row_span=1 column_span=1
+++++++android.view.View role_description='cell' clickable collection_item name='A' row_span=1 column_index=1 column_span=1
+++++++android.view.View role_description='cell' clickable 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