Make use of new AX name calc in Chromium.

chrome/browser/resources/chromeos/chromevox/cvox2/background/output_test.extjs

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 GEN_INCLUDE(['../../testing/assert_additions.js']);
 GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js']);
 
 /**
  * Gets the braille output and asserts that it matches expected values.
  * Annotations in the output that are primitive strings are ignored.
@@ skipping 160 matching lines @@
         ]}, o.speechOutputForTest);
         checkBrailleOutput(
             'h' + i + ' ' + letter,
             [{value: new Output.NodeSpan(el), start: 0, end: 4}],
             o);
         el = el.nextSibling;
       }
 
       range = cursors.Range.fromNode(el);
       o = new Output().withSpeechAndBraille(range, null, 'navigate');
-      assertEqualsJSON({string_: 'Heading 1|b|Link', 'spans_': [
-        // Link.
-        {value: 'name', start: 10, end: 11},
-        {value: {earconId: "LINK"}, start: 10, end: 11},
-        {value: 'role', start: 12, end: 16}
+      assertEqualsJSON({string_: 'Heading 1|b', 'spans_': [
+        {value: 'nameOrDescendants', start: 10, end: 11}
       ]}, o.speechOutputForTest);
       checkBrailleOutput(
-          'h1 b lnk',
-          [{value: new Output.NodeSpan(el), start: 0, end: 2},
-           {value: new Output.NodeSpan(el.firstChild), start: 3, end: 8}],
+          'h1 b',
+          [{value: new Output.NodeSpan(el), start: 0, end: 4}],
           o);
   });
 });
 
 TEST_F('OutputE2ETest', 'Audio', function() {
   this.runWithLoadedTree('<audio src="foo.mp3" controls></audio>',
     function(root) {
       var el = root.firstChild.firstChild.firstChild.firstChild;
       var range = cursors.Range.fromNode(el);
       var o = new Output().withSpeechAndBraille(range, null, 'navigate');
       assertEqualsJSON(
-          {string_: 'audio|Tool bar|play||begin playback|Button',
+          {string_: 'audio|Tool bar|audio|play||Button|begin playback',
            spans_:
               // Entered container toolbar.
 
               // Button.
-              [{value: 'name', start: 15, end: 19},
+              [{value: 'name', start: 21, end: 25},
 
               // Button earcon.
-              {value: {earconId: "BUTTON"}, start: 15, end: 19},
+              {value: {earconId: "BUTTON"}, start: 21, end: 25},
 
-              {value: 'value', start: 20, end: 20},
-              {value: 'help', start: 21, end: 35},
-              {value: 'role', start: 36, end: 42}]
+              {value: 'value', start: 26, end: 26},
+              {value: 'role', start: 27, end: 33},
+              {value: 'description', start: 34, end: 48}],
           }, o.speechOutputForTest);
       checkBrailleOutput(
-          'audio tlbar play begin playback btn',
-          [{value: new Output.NodeSpan(el.parent), start: 0, end: 11},
-           {value: new Output.NodeSpan(el), start: 12, end: 35}],
+          'audio tlbar audio play btn begin playback',
+          [{value: new Output.NodeSpan(el.parent), start: 0, end: 17},
+           {value: new Output.NodeSpan(el), start: 18, end: 41}],
           o);
 
       el = el.nextSibling;
       var prevRange = range;
       range = cursors.Range.fromNode(el);
       var o = new Output().withSpeechAndBraille(range, prevRange, 'navigate');
       assertEqualsJSON({string_: '|0, , slider|audio time scrubber',
           spans_:
               [{value: {'earconId': 'SLIDER'}, start: 0, end: 0},
-               {value: 'help', start: 13, end: 32}]
+               {value: 'description', start: 13, end: 32}]
           }, o.speechOutputForTest);
       // TODO(plundblad): Investigate this.
       checkBrailleOutput(
           '0, , slider audio time scrubber',
           [{value: new Output.NodeSpan(el), start: 0, end: 31}],
           o);
   });
 });
 
 TEST_F('OutputE2ETest', 'Input', function() {
@@ skipping 229 matching lines @@
   this.runWithLoadedTree(function() {/*!
     <select multiple>
       <option>1</option>
       <option>2</option>
     </select>
   */},
   function(root) {
     var el = root.firstChild.firstChild.firstChild;
     var range = cursors.Range.fromNode(el);
     var o = new Output().withSpeechAndBraille(range, null, 'navigate');
-    assertEqualsJSON({string_: '|List box|with 2 items||List item| 1 of 2 ',
+    assertEqualsJSON({string_: '|List box|with 2 items|1|List item| 1 of 2 ',
         spans_: [
           // ListBox.
           // Earcon.
           {value: {earconId:'LISTBOX'}, start: 0, end: 0},
 
-          {value: 'name', start: 23, end: 23},
+          {value: 'name', start: 23, end: 24},
 
           // Earcon.
-          {value: {earconId: 'LIST_ITEM'}, start: 23, end: 23},
+          {value: {earconId: 'LIST_ITEM'}, start: 23, end: 24},
 
-          {value: 'role', start:24, end: 33}
+          {value: 'role', start:25, end: 34}
     ]}, o.speechOutputForTest);
     checkBrailleOutput(
-        'lstbx +2 lstitm 1/2',
+        'lstbx +2 1 lstitm 1/2',
         [{value: new Output.NodeSpan(el.parent), start: 0, end: 8},
-         {value: new Output.NodeSpan(el), start: 9, end: 19}],
+         {value: new Output.NodeSpan(el), start: 9, end: 21}],
         o);
   });
 });
 
 SYNC_TEST_F('OutputE2ETest', 'MessageIdAndEarconValidity', function() {
   for (var key in Output.ROLE_INFO_) {
     var value = Output.ROLE_INFO_[key];
     Msgs.getMsg(value.msgId);
     Msgs.getMsg(value.msgId + '_brl');
     assertFalse(/[A-Z]+/.test(value.msgId));
@@ skipping 32 matching lines @@
     assertEqualsJSON({string_: '|that has content',
         spans_: [
           {value: 'name', start: 1, end: 17}
           ]}, o.speechOutputForTest);
     checkBrailleOutput(
         'that has content',
         [{value: new Output.NodeSpan(el), start: 0, end: 16}],
         o);
   });
 });