Use new earcons in ChromeVox Next.

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 90 matching lines @@
           o);
   });
 });
 
 TEST_F('OutputE2ETest', 'Checkbox', function() {
   this.runWithLoadedTree('<input type="checkbox">',
     function(root) {
       var el = root.firstChild.firstChild;
       var range = cursors.Range.fromNode(el);
       var o = new Output().withSpeechAndBraille(range, null, 'navigate');
-      assertEqualsJSON({string_: '|Check box|not checked', 'spans_': [
+      assertEqualsJSON({string_: '||Check box|not checked', 'spans_': [
+        // Checkbox earcon (based on the state).
+        {value: {earconId: 'CHECK_OFF'}, start: 0, end: 0},
+
         // Attributes.
-        {value: 'name', start: 0, end: 0},
-        {value: 'role', start: 1, end: 10},
-        {value: 'state', start: 11, end: 22},
-
-        // Checkbox earcon (based on the state).
-        {value: {earconId: 'CHECK_OFF'}, start: 11, end: 22}
+        {value: 'name', start: 1, end: 1},
+        {value: 'role', start: 2, end: 11},
+        {value: 'state', start: 12, end: 23}
       ]}, o.speechOutputForTest);
       checkBrailleOutput(
           'chk ( )',
           [{value: new Output.NodeSpan(el), start: 0, end: 7}],
           o);
   });
 });
 
 TEST_F('OutputE2ETest', 'InLineTextBoxValueGetsIgnored', function() {
   this.runWithLoadedTree('<p>OK',
@@ skipping 87 matching lines @@
       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}],
           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',
+      assertEqualsJSON({string_: '|0, , slider|audio time scrubber',
           spans_:
-              [{value: 'help', start: 12, end: 31}]
+              [{value: {'earconId': 'SLIDER'}, start: 0, end: 0},
+               {value: 'help', 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 207 matching lines @@
       <div role="menuitem">a</div>
     </div>
   */},
   function(root) {
     var el = root.firstChild.firstChild;
     var range = cursors.Range.fromNode(el);
     var o = new Output().withSpeechAndBraille(range, null, 'navigate');
     assertEqualsJSON({string_:
             '|Menu|with 1 item|a|Menu item| 1 of 1 ', spans_: [
         {value: 'name', start: 18, end: 19},
+        {value: {earconId: 'BUTTON'}, start:18, end:19},
         {value: 'role', start:20, end: 29}
     ]}, o.speechOutputForTest);
     checkBrailleOutput(
         'mnu +1 a mnuitm 1/1',
         [{value: new Output.NodeSpan(el.parent), start: 0, end: 6},
          {value: new Output.NodeSpan(el), start: 7, end: 19}],
         o);
   });
 });
 
@@ skipping 70 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);
   });
 });