Remove unnecessary code for computing role string

Bug: None
Change-Id: I1c0e69f6d9ac9bc38ff530de1d5034e893d1797e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521214Reviewed-by: Kevin Babbitt <kbabbitt@microsoft.com>
Commit-Queue: Aaron Leventhal <aleventhal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#826961}

third_party/blink/web_tests/accessibility/appearance-affects-role.html

@@ -70,11 +70,11 @@ AXRole.
     }, "Test computed AX role for <input type=color>");
 
     test(function () {
-        check("idate", "AXRole: AXDateField");
+        check("idate", "AXRole: AXDate");
     }, "Test computed AX role for <input type=date>");
 
     test(function () {
-        check("idatetimelocal", "AXRole: AXDateTimeField");
+        check("idatetimelocal", "AXRole: AXDateTime");
     }, "Test computed AX role for <input type=datetime-local>");
 
     test(function () {
@@ -82,7 +82,7 @@ AXRole.
     }, "Test computed AX role for <input type=file>");
 
     test(function () {
-        check("imonth", "AXRole: AXDateTimeField");
+        check("imonth", "AXRole: AXDateTime");
     }, "Test computed AX role for <input type=month>");
 
     test(function () {
@@ -122,7 +122,7 @@ AXRole.
     }, "Test computed AX role for <input type=time>");
 
     test(function () {
-        check("iweek", "AXRole: AXDateTimeField");
+        check("iweek", "AXRole: AXDateTime");
     }, "Test computed AX role for <input type=week>");
 
     test(function () {

third_party/blink/web_tests/accessibility/chromium-only-roles-expected.txt

@@ -4,7 +4,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 PASS axContainer.childAtIndex(0).role is "AXRole: AXSplitter"
 PASS axContainer.childAtIndex(1).role is "AXRole: AXParagraph"
-PASS axContainer.childAtIndex(2).role is "AXRole: AXLabel"
+PASS axContainer.childAtIndex(2).role is "AXRole: AXLabelText"
 PASS axContainer.childAtIndex(3).role is "AXRole: AXForm"
 PASS axContainer.childAtIndex(4).role is "AXRole: AXGenericContainer"
 PASS successfullyParsed is true

third_party/blink/web_tests/accessibility/chromium-only-roles.html

@@ -23,7 +23,7 @@ if (window.testRunner && window.accessibilityController) {
 
     shouldBe('axContainer.childAtIndex(0).role', '"AXRole: AXSplitter"');
     shouldBe('axContainer.childAtIndex(1).role', '"AXRole: AXParagraph"');
-    shouldBe('axContainer.childAtIndex(2).role', '"AXRole: AXLabel"');
+    shouldBe('axContainer.childAtIndex(2).role', '"AXRole: AXLabelText"');
     shouldBe('axContainer.childAtIndex(3).role', '"AXRole: AXForm"');
     shouldBe('axContainer.childAtIndex(4).role', '"AXRole: AXGenericContainer"');
 }

third_party/blink/web_tests/accessibility/display-none-change.html

@@ -13,7 +13,7 @@ test(function(t) {
     // Ensure that it's valid.
     var axLabel = axButton.nameElementAtIndex(0);
     assert_equals(axLabel.isValid, true);
-    assert_equals(axLabel.role, 'AXRole: AXLabel');
+    assert_equals(axLabel.role, 'AXRole: AXLabelText');
 
     // Now un-hide the label.
     var label = document.getElementById('label');
@@ -35,7 +35,7 @@ test(function(t) {
     assert_equals(axLabel.isValid, false);
     assert_equals(axLabel2.isValid, false);
     assert_equals(axLabel3.isValid, true);
-    assert_equals(axLabel3.role, 'AXRole: AXLabel');
+    assert_equals(axLabel3.role, 'AXRole: AXLabelText');
     assert_equals(axLabel.isEqual(axLabel3), false);
     assert_equals(axLabel2.isEqual(axLabel3), false);
 }, "Accessibility objects for display:none elements");

third_party/blink/web_tests/accessibility/element-role-mapping-focusable-expected.txt

@@ -50,15 +50,15 @@ PASS elem.role is "AXRole: AXMenuItemCheckBox"
 menu_radio_id
 PASS elem.role is "AXRole: AXMenuItemRadio"
 input_date_id
-PASS elem.role is "AXRole: AXDateField"
+PASS elem.role is "AXRole: AXDate"
 input_datetime_id
 PASS elem.role is "AXRole: AXTextField"
 input_datetime-local_id
-PASS elem.role is "AXRole: AXDateTimeField"
+PASS elem.role is "AXRole: AXDateTime"
 input_month_id
-PASS elem.role is "AXRole: AXDateTimeField"
+PASS elem.role is "AXRole: AXDateTime"
 input_week_id
-PASS elem.role is "AXRole: AXDateTimeField"
+PASS elem.role is "AXRole: AXDateTime"
 input_file_id
 PASS elem.role is "AXRole: AXButton"
 input_number_id

third_party/blink/web_tests/accessibility/element-role-mapping-focusable.html

@@ -112,11 +112,11 @@ if (window.testRunner && window.accessibilityController) {
     hasRole("menu_checkbox_id", "AXRole: AXMenuItemCheckBox");
     hasRole("menu_radio_id", "AXRole: AXMenuItemRadio");
 
-    hasRole("input_date_id", "AXRole: AXDateField");
+    hasRole("input_date_id", "AXRole: AXDate");
     hasRole("input_datetime_id", "AXRole: AXTextField");
-    hasRole("input_datetime-local_id", "AXRole: AXDateTimeField");
-    hasRole("input_month_id", "AXRole: AXDateTimeField");
-    hasRole("input_week_id", "AXRole: AXDateTimeField");
+    hasRole("input_datetime-local_id", "AXRole: AXDateTime");
+    hasRole("input_month_id", "AXRole: AXDateTime");
+    hasRole("input_week_id", "AXRole: AXDateTime");
 
     hasRole("input_file_id", "AXRole: AXButton");
     hasRole("input_number_id", "AXRole: AXSpinButton");

third_party/blink/web_tests/accessibility/scroll-containers.html

@@ -19,7 +19,7 @@
 <script>
 test(function(t) {
     var axWebArea = accessibilityController.rootElement;
-    assert_equals(axWebArea.role, "AXRole: AXWebArea");
+    assert_equals(axWebArea.role, "AXRole: AXRootWebArea");
 
     assert_true(axWebArea.isScrollableContainer);
     assert_equals(axWebArea.scrollOffsetY, 0);

third_party/blink/web_tests/accessibility/scroll-window-horiz-sends-notification.html

@@ -24,7 +24,7 @@ async_test((t) => {
   assert_equals(window.pageXOffset, 0);
 
   accessibilityController.addNotificationListener(t.step_func((target, notification) => {
-    if (target.role == 'AXRole: AXWebArea' && notification == 'LayoutComplete') {
+    if (target.role == 'AXRole: AXRootWebArea' && notification == 'LayoutComplete') {
       console.log('Got notification on web area');
       accessibilityController.removeNotificationListener();
       assert_equals(window.pageXOffset, 500);

third_party/blink/web_tests/accessibility/scroll-window-sends-notification.html

@@ -25,7 +25,7 @@ async_test((t) => {
   assert_equals(window.pageXOffset, 0);
 
   accessibilityController.addNotificationListener(t.step_func((target, notification) => {
-    if (target.role == 'AXRole: AXWebArea' && notification == 'LayoutComplete') {
+    if (target.role == 'AXRole: AXRootWebArea' && notification == 'LayoutComplete') {
       console.log('Got notification on web area');
       accessibilityController.removeNotificationListener();
       assert_equals(window.pageYOffset, 500);