Improve braille related message descriptions and clean up message handling in Chromevox.

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 226 matching lines @@
 
 TEST_F('OutputE2ETest', 'Input', function() {
   this.runWithLoadedTree(
       '<input type="text"></input>' +
       '<input type="email"></input>' +
       '<input type="password"></input>' +
       '<input type="tel"></input>'          +
       '<input type="number"></input>' +
       '<input type="time"></input>' +
       '<input type="date"></input>' +
+      '<input type="file"</input>' +
+      '<input type="search"</input>' +
       '<input type="invalidType"</input>',
     function(root) {
       var expected = {string_: '', 'spans_': [
               {value: 'name', start: 0, end: 0},
 
               // Earcon
               {value: {earconId: 'EDITABLE_TEXT'}, start: 0, end: 0},
 
               // Selection span.
               {value: {startIndex: 0, endIndex: 0}, start: 1, end: 1},
 
               {value: 'value', start: 1, end: 1},
               {value: 'inputType', start: 2}
       ]};
 
       var expectedSpeechValues = [
         '||Edit text',
         '||Edit text, email entry',
         '||Password edit text',
-        '||Edit text, number entry',
+        '||Edit text numeric only',
         {string_: '||Spin button', spans_: [{value: 'name', start: 0, end: 0},
             {value: {earconId:'LISTBOX'}, start: 0, end: 0},
             {value: {startIndex: 0, endIndex: 0}, start: 1, end: 1},
             {value: 'value', start: 1, end: 1},
             {value: 'role', start: 2, end: 13}]},
         {string_: '||Time control', spans_: [{value: 'name', start: 0, end: 0},
             {value: 'value', start: 1, end: 1},
             {value: 'role', start: 2, end: 14}]},
         {string_: '||Date control', spans_: [{value: 'name', start: 0, end: 0},
             {value: 'value', start: 1, end: 1},
             {value: 'role', start: 2, end: 14}]},
-        "||Edit text"
+        {string_: 'Choose File|No file chosen|Button',
+         spans_: [{value: 'name', start: 0, end: 11},
+                  {value: {earconId: "BUTTON"}, start: 0, end: 11},
+                  {value: 'value', start: 12, end: 26},
+                  {value: 'role', start: 27, end: 33}]},
+        '||Edit text, search entry',
+        '||Edit text'
       ];
       // TODO(plundblad): Some of these are wrong, there should be an initial
       // space for the cursor in edit fields.
       var expectedBrailleValues = [
         ' ed',
         ' @ed',
         ' pwded',
         ' #ed',
         ' spnbtn',
         {string_: 'time'},
         {string_: 'date'},
+        {string_: 'Choose File No file chosen btn'},
+        ' srched',
         ' ed'
       ];
       assertEquals(expectedSpeechValues.length, expectedBrailleValues.length);
 
       var el = root.firstChild.firstChild;
       expectedSpeechValues.forEach(function(expectedValue) {
         var range = cursors.Range.fromNode(el);
         var o = new Output().withSpeechAndBraille(range, null, 'navigate');
         if (typeof expectedValue == 'object') {
           assertEqualsJSON(expectedValue, o.speechOutputForTest);
@@ skipping 181 matching lines @@
         'lstbx +2 lstitm 1/2',
         [{value: new Output.NodeSpan(el.parent), start: 0, end: 8},
          {value: new Output.NodeSpan(el), start: 9, end: 19}],
         o);
   });
 });
 
 SYNC_TEST_F('OutputE2ETest', 'MessageIdAndEarconValidity', function() {
   for (var key in Output.ROLE_INFO_) {
     var value = Output.ROLE_INFO_[key];
-    cvox.ChromeVox.msgs.getMsg(value.msgId);
-    cvox.ChromeVox.msgs.getMsg(value.msgId + '_brl');
+    Msgs.getMsg(value.msgId);
+    Msgs.getMsg(value.msgId + '_brl');
     assertFalse(/[A-Z]+/.test(value.msgId));
     if (value.earconId)
       assertNotNullNorUndefined(cvox.Earcon[value.earconId]);
   }
   for (var key in Output.STATE_INFO_) {
     var value = Output.STATE_INFO_[key];
     for (innerKey in value) {
       var innerValue = value[innerKey];
-      cvox.ChromeVox.msgs.getMsg(innerValue.msgId);
-      cvox.ChromeVox.msgs.getMsg(innerValue.msgId + '_brl');
+      Msgs.getMsg(innerValue.msgId);
+      Msgs.getMsg(innerValue.msgId + '_brl');
       assertFalse(/[A-Z]+/.test(innerValue.msgId));
       if (innerValue.earconId)
         assertNotNullNorUndefined(cvox.Earcon[innerValue.earconId]);
     }
   }
+  for (var key in Output.INPUT_TYPE_MESSAGE_IDS_) {
+    var msgId = Output.INPUT_TYPE_MESSAGE_IDS_[key];
+    assertFalse(/[A-Z]+/.test(msgId));
+    Msgs.getMsg(msgId);
+    Msgs.getMsg(msgId + '_brl');
+  }
 });
 
 TEST_F('OutputE2ETest', 'DivOmitsRole', function() {
   this.runWithLoadedTree(function() {/*!
     <div>that has content</div>
     <div></div>
     <div role='group'><div>nested content</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_: '|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);
   });
 });