Re-enable DumpAccessibilityTreeTest.AccessibilityAriaCombobox

Bug: 622387
Change-Id: I41eb5ed6a4ba57fad3e884b24a317036e44eb218
Tbr: aboxhall@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/938223Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Cr-Commit-Position: refs/heads/master@{#539326}

content/browser/accessibility/dump_accessibility_tree_browsertest.cc

@@ -412,10 +412,7 @@ IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
   RunAriaTest(FILE_PATH_LITERAL("aria-columnheader.html"));
 }
 
-// crbug.com/98976 will cause new elements to be added to the Blink a11y tree
-// Re-baseline after the Blink change goes in
-IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest,
-                       DISABLED_AccessibilityAriaCombobox) {
+IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, AccessibilityAriaCombobox) {
   RunAriaTest(FILE_PATH_LITERAL("aria-combobox.html"));
 }
 

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

-android.webkit.WebView focusable focused scrollable
-++android.view.View
-++++android.view.View clickable name='State'
-++++android.widget.Spinner clickable editable_text focusable name='State' input_type=1
-++android.widget.ListView collection item_count=2 row_count=2
+android.webkit.WebView focusable scrollable
+++android.view.View name='State'
+++android.widget.EditText clickable editable_text focusable focused name='State' input_type=1
+++android.widget.ListView role_description='list box' clickable collection item_count=2 row_count=2
 ++++android.view.View clickable collection_item focusable name='Alabama'
-++++android.view.View clickable collection_item focusable name='Alaska' item_index=1 row_index=1
+++++android.view.View clickable collection_item focusable selected name='Alaska' item_index=1 row_index=1
\ No newline at end of file

content/test/data/accessibility/aria/aria-combobox-expected-mac.txt

 AXWebArea
 ++AXGroup
 ++++AXStaticText AXValue='State'
-++AXGroup
-++++AXComboBox AXTitleUIElement='AXGroup group' AXLinkedUIElements=["AXList"]
+++AXComboBox AXTitle='State' AXFocused='1'
 ++AXList
-++++AXStaticText AXTitle='Alabama'
-++++AXStaticText AXTitle='Alaska' AXFocused='1'
+++++AXStaticText AXValue='Alabama'
+++++AXStaticText AXValue='Alaska'
\ No newline at end of file

content/test/data/accessibility/aria/aria-combobox-expected-win.txt

-ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
-++IA2_ROLE_SECTION READONLY
-++++ROLE_SYSTEM_STATICTEXT name='State'
-++++ROLE_SYSTEM_COMBOBOX name='State' READONLY FOCUSABLE
-++ROLE_SYSTEM_LIST
-++++ROLE_SYSTEM_LISTITEM name='Alabama' FOCUSABLE SELECTABLE
-++++ROLE_SYSTEM_LISTITEM name='Alaska' FOCUSABLE SELECTABLE
+ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ia2_hypertext='<obj0><obj1><obj2>'
+++IA2_ROLE_SECTION ia2_hypertext='State'
+++++ROLE_SYSTEM_STATICTEXT name='State' ia2_hypertext='State'
+++ROLE_SYSTEM_COMBOBOX name='State' READONLY FOCUSABLE HASPOPUP
+++ROLE_SYSTEM_LIST EXPANDED ia2_hypertext='<obj0><obj1>'
+++++ROLE_SYSTEM_LISTITEM name='Alabama' FOCUSABLE SELECTABLE ia2_hypertext='Alabama'
+++++ROLE_SYSTEM_LISTITEM name='Alaska' SELECTED FOCUSABLE SELECTABLE ia2_hypertext='Alaska'
\ No newline at end of file