Adjust output rules related menus

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 433 matching lines @@
 TEST_F('OutputE2ETest', 'Menu', function() {
   this.runWithLoadedTree(function() {/*!
     <div role="menu">
       <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_: 'a|Menu item| 1 of 1 ||Menu', spans_:
-        [{value: {earconId: 'BUTTON'}, start : 0, end: 1},
-         {value: 'name', start: 21, end: 21},
-         {value: {earconId: 'LISTBOX'}, start: 21, end: 21},
-         {value: 'role', start: 22, end: 26}]}, o.speechOutputForTest);
+    checkSpeechOutput('a|Menu item| 1 of 1 ', [
+      {value: 'name', start: 0, end: 1},
+      {value: 'role', start: 2, end: 11}], o);
     checkBrailleOutput(
-        'a mnuitm 1/1 mnu',
-        [{value: new Output.NodeSpan(el), start: 0, end: 12},
-         {value: new Output.NodeSpan(el.parent), start: 13, end: 16}],
+        'a mnuitm 1/1',
+        [{value: new Output.NodeSpan(el), start: 0, end: 12}],
         o);
   });
 });
 
 TEST_F('OutputE2ETest', 'ListBox', function() {
   this.runWithLoadedTree(function() {/*!
     <select multiple>
       <option>1</option>
       <option>2</option>
     </select>
@@ skipping 172 matching lines @@
   this.runWithLoadedTree(function() {/*!
       <div><button>ok</button></div>
     */},
     function(root) {
       var div = root.find({role: 'div'});
       var o = new Output().withSpeech(cursors.Range.fromNode(div));
       assertEquals('ok|Button'
                    , o.speechOutputForTest.string_);
   });
 });