Reland: Further refine div output when a div receives focus

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 630 matching lines @@
   });
 });
 
 TEST_F('OutputE2ETest', 'ComplexDiv', function() {
   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_);
+      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>
     */},
     function(root) {
       var r1 = cursors.Range.fromNode(root.firstChild);
       var r2 = cursors.Range.fromNode(root.lastChild);
       assertEquals('start|Row',
           new Output().withSpeech(r1, r2).speechOutputForTest.string_);
   });
 });