Name calculation should not include nameFrom:author descendants.

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 336 matching lines @@
                 end: expectedValue.string_.length}],
               o);
         }
         el = el.nextSibling;
       });
   });
 });
 
 TEST_F('OutputE2ETest', 'List', function() {
   this.runWithLoadedTree(
-      '<ul><li>a<li>b<li>c</ul>',
+      '<ul><li aria-label="a">a<li>b<li>c</ul>',
     function(root) {
       var el = root.firstChild.firstChild;
       var range = cursors.Range.fromNode(el);
       var o = new Output().withSpeechAndBraille(range, null, 'navigate');
       checkSpeechOutput('a|List item|list|with 3 items',
           [
-            {value: 'name', start: 0, end: 1},
-            {value: new Output.EarconAction('LIST_ITEM'), start: 0, end: 1},
-            {value: 'role', start: 12, end: 16}
+            { value: 'nameOrDescendants', start: 0, end: 1 },
+            { value: 'role', start: 12, end: 16 }

[David Tseng, 2017/05/17 18:20:46]

What happened to the earcon?

           ],
           o);
       // TODO(plundblad): This output is wrong.  Add special handling for
       // braille here.
       checkBrailleOutput(
           'a lstitm list +3',
-          [{value: new Output.NodeSpan(el), start: 0, end: 8},
-           {value: new Output.NodeSpan(el.parent), start: 9, end: 16}],
+          [
+            {value: new Output.NodeSpan(el), start: 0, end: 8},
+            {value: new Output.NodeSpan(el.parent), start: 9, end: 16}
+          ],
           o);
   });
 });
 
 TEST_F('OutputE2ETest', 'Tree', function() {
   this.runWithLoadedTree(function() {/*!
     <ul role="tree">
       <li aria-expanded="true" role="treeitem">a
       <li role="treeitem">b
       <li aria-expanded="false" role="treeitem">c
@@ skipping 257 matching lines @@
       assertEquals('This fragment Should be separated with spaces'
                    , joined.speechOutputForTest.string_);
   });
 });
 
 TEST_F('OutputE2ETest', 'ComplexDiv', function() {
   this.runWithLoadedTree(function() {/*!
       <div><button>ok</button></div>
     */},
     function(root) {
-      var div = root.find({role: 'div'});
+      var div = root.find({role: 'genericContainer'});
       var o = new Output().withSpeech(cursors.Range.fromNode(div));
       assertEquals('ok', o.speechOutputForTest.string_);
   });
 });
 
 TEST_F('OutputE2ETest', 'ContainerFocus', function() {
   this.runWithLoadedTree(function() {/*!
       <div role="row" tabindex=0 aria-label="start"></div>
       <div role="row" tabindex=0 aria-label="end"></div>
     */},
@@ skipping 100 matching lines @@
       checkSpeechOutput('2|Min 1|Max 10|volume|Spin button',
           [
             {value: 'valueForRange', start: 0, end: 1},
             {value: 'name', start: 15,end: 21},
             {value: new Output.EarconAction('LISTBOX'), start: 15, end: 21},
             {value: 'role', start: 22, end: 33}
           ],
           o);
   });
 });